Merge pull request #18 from tgharold/20240528-1045

Upgrade PR merge / tag to use JFrog workflows 1.16.5

Author: schilco-rimdev

.github/workflows/pr-build.yml

@@ -16,7 +16,7 @@ on:
 jobs:
 
   pr-build:
-    uses: ritterim/public-github-actions/.github/workflows/npm-packages-pr-build.yml@v1.9.0
+    uses: ritterim/public-github-actions/.github/workflows/npm-packages-pr-build.yml@v1.16.5
     #uses: ./.github/workflows/npm-packages-pr-build.yml
     with:
       always_increment_patch_version: true

.github/workflows/pr-merged.yml

@@ -19,14 +19,21 @@ on:
 jobs:
 
   npm-packages-pr-create-tag:
-    uses: ritterim/public-github-actions/.github/workflows/npm-packages-pr-create-tag.yml@v1.9.0
-    #uses: ./.github/workflows/npm-packages-pr-create-tag.yml
+    uses: ritterim/public-github-actions/.github/workflows/npm-packages-pr-create-tag-jfrog.yml@v1.16.5
+    #uses: ./.github/workflows/npm-packages-pr-create-tag-jfrog.yml
     if: github.event.pull_request.merged == true
     secrets:
       gh_actions_secret_passing_passphrase: ${{ secrets.ACTIONS_SECRET_PASSING_PASSPHRASE }}
       gh_app_private_key: ${{ secrets.RIMDEV_NPM_RELEASES_APP_PRIVATE_KEY }}
     with:
       always_increment_patch_version: true
       gh_app_id: ${{ vars.RIMDEV_NPM_RELEASES_APP_APPID }}
+      jfrog_api_base_url: ${{ vars.JFROG_API_BASE_URL }}
+      jfrog_artifactory_repository: "${{ vars.JFROG_NPM_PACKAGE_REPO_BASENAME }}-draft"
+      jfrog_audit_xray_watch_list: ${{ vars.JFROG_AUDIT_XRAY_WATCH_LIST }}
+      jfrog_build_basename: ${{ vars.JFROG_BUILD_BASENAME }}
+      jfrog_npm_feed_repo: ${{ vars.JFROG_ARTIFACTORY_VIRTUAL_REPO_NPM }}
+      jfrog_npm_package_repo_basename: ${{ vars.JFROG_NPM_PACKAGE_REPO_BASENAME }}
+      jfrog_oidc_provider_name: ${{ vars.JFROG_GHA_OIDC_PROVIDER_NAME }}
       npm_package_name: skellycss
       run_tests: false

.github/workflows/version-tag-build-master.yml

@@ -15,13 +15,20 @@ on:
 jobs:
 
   version-tag-build:
-    uses: ritterim/public-github-actions/.github/workflows/npm-packages-release-on-tag.yml@v1.9.0
-    #uses: ./.github/workflows/npm-packages-release-on-tag.yml
+    uses: ritterim/public-github-actions/.github/workflows/npm-packages-release-on-tag-jfrog.yml@v1.16.5
+    #uses: ./.github/workflows/npm-packages-release-on-tag-jfrog.yml
     secrets:
       npmjs_org_api_key: ${{ secrets.RITTERIM_NPMJS_PUBLISH_TOKEN }}
     with:
       allowed_branches: |
         main
+      jfrog_api_base_url: ${{ vars.JFROG_API_BASE_URL }}
+      jfrog_artifactory_repository: "${{ vars.JFROG_NPM_PACKAGE_REPO_BASENAME }}-prod"
+      jfrog_audit_xray_watch_list: ${{ vars.JFROG_AUDIT_XRAY_WATCH_LIST }}
+      jfrog_build_basename: ${{ vars.JFROG_BUILD_BASENAME }}
+      jfrog_npm_feed_repo: ${{ vars.JFROG_ARTIFACTORY_VIRTUAL_REPO_NPM }}
+      jfrog_npm_package_repo_basename: ${{ vars.JFROG_NPM_PACKAGE_REPO_BASENAME }}
+      jfrog_oidc_provider_name: ${{ vars.JFROG_GHA_OIDC_PROVIDER_NAME }}
       npm_package_name: skellycss
       run_tests: false
       npmjs_org_access_public: true