Skip to content

Commit 06683e9

Browse files
Merge pull request #865 from tgharold/20240528-1144
Upgrade to use JFrog workflows v1.16.5
2 parents 4aa6ac7 + 4676482 commit 06683e9

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

.github/workflows/pr-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717

1818
pr-build:
19-
uses: ritterim/public-github-actions/.github/workflows/npm-packages-pr-build.yml@v1.9.0
19+
uses: ritterim/public-github-actions/.github/workflows/npm-packages-pr-build.yml@v1.16.5
2020
#uses: ./.github/workflows/npm-packages-pr-build.yml
2121
with:
2222
always_increment_patch_version: true

.github/workflows/pr-merged.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,21 @@ on:
1919
jobs:
2020

2121
npm-packages-pr-create-tag:
22-
uses: ritterim/public-github-actions/.github/workflows/npm-packages-pr-create-tag.yml@v1.9.0
23-
#uses: ./.github/workflows/npm-packages-pr-create-tag.yml
22+
uses: ritterim/public-github-actions/.github/workflows/npm-packages-pr-create-tag-jfrog.yml@v1.16.5
23+
#uses: ./.github/workflows/npm-packages-pr-create-tag-jfrog.yml
2424
if: github.event.pull_request.merged == true
2525
secrets:
2626
gh_actions_secret_passing_passphrase: ${{ secrets.ACTIONS_SECRET_PASSING_PASSPHRASE }}
2727
gh_app_private_key: ${{ secrets.RIMDEV_NPM_RELEASES_APP_PRIVATE_KEY }}
2828
with:
2929
always_increment_patch_version: true
3030
gh_app_id: ${{ vars.RIMDEV_NPM_RELEASES_APP_APPID }}
31+
jfrog_api_base_url: ${{ vars.JFROG_API_BASE_URL }}
32+
jfrog_artifactory_repository: "${{ vars.JFROG_NPM_PACKAGE_REPO_BASENAME }}-draft"
33+
jfrog_audit_xray_watch_list: ${{ vars.JFROG_AUDIT_XRAY_WATCH_LIST }}
34+
jfrog_build_basename: ${{ vars.JFROG_BUILD_BASENAME }}
35+
jfrog_npm_feed_repo: ${{ vars.JFROG_ARTIFACTORY_VIRTUAL_REPO_NPM }}
36+
jfrog_npm_package_repo_basename: ${{ vars.JFROG_NPM_PACKAGE_REPO_BASENAME }}
37+
jfrog_oidc_provider_name: ${{ vars.JFROG_GHA_OIDC_PROVIDER_NAME }}
3138
npm_package_name: platform-ui
3239
run_tests: false

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

+9-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,20 @@ on:
1515
jobs:
1616

1717
version-tag-build:
18-
uses: ritterim/public-github-actions/.github/workflows/npm-packages-release-on-tag.yml@v1.9.0
19-
#uses: ./.github/workflows/npm-packages-release-on-tag.yml
18+
uses: ritterim/public-github-actions/.github/workflows/npm-packages-release-on-tag-jfrog.yml@v1.16.5
19+
#uses: ./.github/workflows/npm-packages-release-on-tag-jfrog.yml
2020
secrets:
2121
npmjs_org_api_key: ${{ secrets.RITTERIM_NPMJS_PUBLISH_TOKEN }}
2222
with:
2323
allowed_branches: |
2424
master
25+
jfrog_api_base_url: ${{ vars.JFROG_API_BASE_URL }}
26+
jfrog_artifactory_repository: "${{ vars.JFROG_NPM_PACKAGE_REPO_BASENAME }}-prod"
27+
jfrog_audit_xray_watch_list: ${{ vars.JFROG_AUDIT_XRAY_WATCH_LIST }}
28+
jfrog_build_basename: ${{ vars.JFROG_BUILD_BASENAME }}
29+
jfrog_npm_feed_repo: ${{ vars.JFROG_ARTIFACTORY_VIRTUAL_REPO_NPM }}
30+
jfrog_npm_package_repo_basename: ${{ vars.JFROG_NPM_PACKAGE_REPO_BASENAME }}
31+
jfrog_oidc_provider_name: ${{ vars.JFROG_GHA_OIDC_PROVIDER_NAME }}
2532
npm_package_name: platform-ui
2633
run_tests: false
2734
npmjs_org_access_public: true

0 commit comments

Comments
 (0)