From e9e34f863f038979f2751714122032cb7c1f4553 Mon Sep 17 00:00:00 2001 From: delarea Date: Mon, 5 May 2025 11:36:13 +0300 Subject: [PATCH 1/4] Promote version to v4.5.11 --- node_modules/.package-lock.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 006deada5..1f5058592 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,6 +1,6 @@ { "name": "@jfrog/setup-jfrog-cli", - "version": "4.5.10", + "version": "4.5.11", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package-lock.json b/package-lock.json index 254bb68aa..042a74345 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@jfrog/setup-jfrog-cli", - "version": "4.5.10", + "version": "4.5.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@jfrog/setup-jfrog-cli", - "version": "4.5.10", + "version": "4.5.11", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index f3030ba4e..388c4258b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@jfrog/setup-jfrog-cli", - "version": "4.5.10", + "version": "4.5.11", "private": true, "description": "Setup JFrog CLI in GitHub Actions", "main": "lib/main.js", From f446cc9cec25d43b9e312a025e9df53f7a744da6 Mon Sep 17 00:00:00 2001 From: delarea Date: Mon, 5 May 2025 11:39:08 +0300 Subject: [PATCH 2/4] Add safe to test label to oidc tests --- .github/workflows/oidc-integration-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/oidc-integration-test.yml b/.github/workflows/oidc-integration-test.yml index 099767e6c..8fcfee7e9 100644 --- a/.github/workflows/oidc-integration-test.yml +++ b/.github/workflows/oidc-integration-test.yml @@ -23,6 +23,7 @@ permissions: jobs: generate-platform-oidc-integration: + if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push' strategy: # Using "include" instead of a matrix of arrays gives us fine-grained control over test combinations. # This is needed because some audience values (e.g., URLs) contain characters not valid in matrix keys or job names. From 5798d49dee230d1498d27d1e4d448fd1e7bf85a8 Mon Sep 17 00:00:00 2001 From: delarea Date: Mon, 5 May 2025 12:27:42 +0300 Subject: [PATCH 3/4] Remove the check for job summary --- ...nd-job-summary-test.yml => auto-build-publish.yml} | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) rename .github/workflows/{auto-build-publish-and-job-summary-test.yml => auto-build-publish.yml} (91%) diff --git a/.github/workflows/auto-build-publish-and-job-summary-test.yml b/.github/workflows/auto-build-publish.yml similarity index 91% rename from .github/workflows/auto-build-publish-and-job-summary-test.yml rename to .github/workflows/auto-build-publish.yml index 2186eae69..001eff58f 100644 --- a/.github/workflows/auto-build-publish-and-job-summary-test.yml +++ b/.github/workflows/auto-build-publish.yml @@ -84,13 +84,4 @@ jobs: - name: Add npm modules to local build-info run: | jf npm-config --repo-resolve npm-remote - jf npm install - - - name: Validate job summary was written (sanity check) - shell: bash - run: | - if [ ! -s "$GITHUB_STEP_SUMMARY" ]; then - echo "❌ Job summary file is empty!" - exit 1 - fi - echo "✅ Job summary written!" \ No newline at end of file + jf npm install \ No newline at end of file From 5c7a1755546ef773c98b8df913c355d178f2e8dd Mon Sep 17 00:00:00 2001 From: delarea Date: Mon, 5 May 2025 12:31:51 +0300 Subject: [PATCH 4/4] cleanup only when oidc tests executed --- .github/workflows/oidc-integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/oidc-integration-test.yml b/.github/workflows/oidc-integration-test.yml index 8fcfee7e9..c1bf2f8dd 100644 --- a/.github/workflows/oidc-integration-test.yml +++ b/.github/workflows/oidc-integration-test.yml @@ -146,7 +146,7 @@ jobs: cleanup-oidc-integration: needs: oidc-test - if: always() + if: success() || failure() strategy: matrix: include: