From 923a33051c4ab4e4a88201e182687916b4a1d97a Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 12:23:51 +0300 Subject: [PATCH 01/13] fix latest build Signed-off-by: Michael Sverdlov --- pip_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pip_test.go b/pip_test.go index baba851d5..70772e6ec 100644 --- a/pip_test.go +++ b/pip_test.go @@ -146,10 +146,13 @@ func assertDependenciesRequestedByAndChecksums(t *testing.T, module buildinfo.Mo assert.EqualValues(t, [][]string{{moduleName}}, dependency.RequestedBy) case "six:1.16.0": assert.EqualValues(t, [][]string{{"nltk:3.4.5", moduleName}}, dependency.RequestedBy) - case "altgraph:0.17.3": - assert.EqualValues(t, [][]string{{"macholib:1.11", moduleName}}, dependency.RequestedBy) default: - assert.Fail(t, "Unexpected dependency "+dependency.Id) + // Altgraph version can change + if assert.Contains(t, dependency.Id, "altgraph") { + assert.EqualValues(t, [][]string{{"macholib:1.11", moduleName}}, dependency.RequestedBy) + } else { + assert.Fail(t, "Unexpected dependency "+dependency.Id) + } } } } From 8b8e41eaa0ada89a6f77967a00579bce59df9748 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 13:08:58 +0300 Subject: [PATCH 02/13] fix latest build Signed-off-by: Michael Sverdlov --- .github/workflows/scriptTests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 95c2cce63..4791bf8a2 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -62,10 +62,12 @@ jobs: run: | npm install bin/jfrog${{ matrix.suite.osSuffix }} --version + if: !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') - name: Test install npm - v2-jf working-directory: build/npm/v2-jf run: | npm install bin/jf${{ matrix.suite.osSuffix }} --version + if: !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') From 6c571f04b4945dc830b3764ea923a706c4f4472d Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 13:12:24 +0300 Subject: [PATCH 03/13] fix latest build Signed-off-by: Michael Sverdlov --- .github/workflows/scriptTests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 4791bf8a2..d89cc9b6a 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -62,12 +62,12 @@ jobs: run: | npm install bin/jfrog${{ matrix.suite.osSuffix }} --version - if: !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') + if: ${{ !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') }} - name: Test install npm - v2-jf working-directory: build/npm/v2-jf run: | npm install bin/jf${{ matrix.suite.osSuffix }} --version - if: !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') + if: ${{ !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') }} From 8e7ea632a7f34061c8a396adb553376462346458 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 13:44:20 +0300 Subject: [PATCH 04/13] fix latest build Signed-off-by: Michael Sverdlov --- .github/workflows/scriptTests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index d89cc9b6a..738069f01 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -62,12 +62,14 @@ jobs: run: | npm install bin/jfrog${{ matrix.suite.osSuffix }} --version - if: ${{ !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') }} + if: | + ${{ !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') }} - name: Test install npm - v2-jf working-directory: build/npm/v2-jf run: | npm install bin/jf${{ matrix.suite.osSuffix }} --version - if: ${{ !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') }} + if: | + ${{ !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') }} From eda2f306b5f3774ca8a07e5ac182df7f94bde015 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 13:47:29 +0300 Subject: [PATCH 05/13] fix latest build Signed-off-by: Michael Sverdlov --- .github/workflows/scriptTests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 738069f01..0e530bebc 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -63,13 +63,12 @@ jobs: npm install bin/jfrog${{ matrix.suite.osSuffix }} --version if: | - ${{ !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') }} + !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') - name: Test install npm - v2-jf working-directory: build/npm/v2-jf run: | npm install bin/jf${{ matrix.suite.osSuffix }} --version - if: | - ${{ !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') }} + if: ${{ !contains(github.event.head_commit.modified, 'build/npm/v2-jf/package.json') }} From 793134c3e002ef531ca7d411e3f2990b370b615b Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 13:55:00 +0300 Subject: [PATCH 06/13] fix latest build Signed-off-by: Michael Sverdlov --- .github/workflows/scriptTests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 0e530bebc..ea4c5ab1e 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -63,12 +63,13 @@ jobs: npm install bin/jfrog${{ matrix.suite.osSuffix }} --version if: | - !contains(github.event.head_commit.modified, ${{ working-directory }}'/package.json') + !contains(github.event.head_commit.modified, 'build/npm/v2/package.json')" - name: Test install npm - v2-jf working-directory: build/npm/v2-jf run: | npm install bin/jf${{ matrix.suite.osSuffix }} --version - if: ${{ !contains(github.event.head_commit.modified, 'build/npm/v2-jf/package.json') }} + if: | + !contains(github.event.head_commit.modified, 'build/npm/v2-jf/package.json')" From 0725252b80fd887ed89e32a230dffabb64f3d1c3 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 13:55:12 +0300 Subject: [PATCH 07/13] fix latest build Signed-off-by: Michael Sverdlov --- .github/workflows/scriptTests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index ea4c5ab1e..174556ff4 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -63,7 +63,7 @@ jobs: npm install bin/jfrog${{ matrix.suite.osSuffix }} --version if: | - !contains(github.event.head_commit.modified, 'build/npm/v2/package.json')" + !contains(github.event.head_commit.modified, 'build/npm/v2/package.json') - name: Test install npm - v2-jf working-directory: build/npm/v2-jf @@ -71,5 +71,5 @@ jobs: npm install bin/jf${{ matrix.suite.osSuffix }} --version if: | - !contains(github.event.head_commit.modified, 'build/npm/v2-jf/package.json')" + !contains(github.event.head_commit.modified, 'build/npm/v2-jf/package.json') From 04aed310a6fd150d43874f5c954a3ca87d37279e Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 13:57:32 +0300 Subject: [PATCH 08/13] fix latest build Signed-off-by: Michael Sverdlov --- .github/workflows/scriptTests.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 174556ff4..064c1be70 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -33,6 +33,13 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} + - name: Go Cache + uses: actions/cache@v3 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-go- + - name: Test install CLI - jf run: sh build/installcli/jf.sh && jf --version From af35789ccb69410d309c912ef81c838731274265 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 13:59:41 +0300 Subject: [PATCH 09/13] fix latest build Signed-off-by: Michael Sverdlov --- build/npm/v2-jf/package.json | 2 +- build/npm/v2/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/npm/v2-jf/package.json b/build/npm/v2-jf/package.json index 8d98ad931..6c59fb3c4 100644 --- a/build/npm/v2-jf/package.json +++ b/build/npm/v2-jf/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.48.0", + "version": "2.499.0", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/build/npm/v2/package.json b/build/npm/v2/package.json index 2cac51af2..a59fbca92 100644 --- a/build/npm/v2/package.json +++ b/build/npm/v2/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2", - "version": "2.48.0", + "version": "2.499.0", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, From d854d1c77bce28f520312c9741ab79732b62b749 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 14:03:29 +0300 Subject: [PATCH 10/13] fix latest build Signed-off-by: Michael Sverdlov --- .github/workflows/scriptTests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 064c1be70..2849916f9 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -67,6 +67,8 @@ jobs: - name: Test install npm - v2 working-directory: build/npm/v2 run: | + echo github.event.head_commit.modified + echo ${{ github.event.head_commit.modified }} npm install bin/jfrog${{ matrix.suite.osSuffix }} --version if: | From 008ca18b001661a17355d06d44e3a505de3c4aef Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 14:14:36 +0300 Subject: [PATCH 11/13] fix latest build Signed-off-by: Michael Sverdlov --- .github/workflows/scriptTests.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 2849916f9..3a873a593 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -64,21 +64,24 @@ jobs: ./jf${{ matrix.suite.osSuffix }} --version if: ${{ matrix.suite.os == 'windows' }} + - name: Check if package.json build files changed + id: npm-changed-files + uses: tj-actions/changed-files@v39 + with: + files: build/npm/*/package.json + - name: Test install npm - v2 working-directory: build/npm/v2 run: | - echo github.event.head_commit.modified echo ${{ github.event.head_commit.modified }} npm install bin/jfrog${{ matrix.suite.osSuffix }} --version - if: | - !contains(github.event.head_commit.modified, 'build/npm/v2/package.json') + if: steps.npm-changed-files.outputs.any_changed == 'false' - name: Test install npm - v2-jf working-directory: build/npm/v2-jf run: | npm install bin/jf${{ matrix.suite.osSuffix }} --version - if: | - !contains(github.event.head_commit.modified, 'build/npm/v2-jf/package.json') + if: steps.npm-changed-files.outputs.any_changed == 'false' From 538e4ffbe8fa6fa1ddd152251309d847f5f2a721 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 14:17:34 +0300 Subject: [PATCH 12/13] fix latest build Signed-off-by: Michael Sverdlov --- build/npm/v2-jf/package.json | 2 +- build/npm/v2/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/npm/v2-jf/package.json b/build/npm/v2-jf/package.json index 6c59fb3c4..8d98ad931 100644 --- a/build/npm/v2-jf/package.json +++ b/build/npm/v2-jf/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.499.0", + "version": "2.48.0", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/build/npm/v2/package.json b/build/npm/v2/package.json index a59fbca92..2cac51af2 100644 --- a/build/npm/v2/package.json +++ b/build/npm/v2/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2", - "version": "2.499.0", + "version": "2.48.0", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, From 6ea6ec0aa87694f056ee19d98a209abb1ecc83a7 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 4 Oct 2023 14:20:34 +0300 Subject: [PATCH 13/13] fix latest build Signed-off-by: Michael Sverdlov --- .github/workflows/scriptTests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 3a873a593..feab0077b 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -73,7 +73,6 @@ jobs: - name: Test install npm - v2 working-directory: build/npm/v2 run: | - echo ${{ github.event.head_commit.modified }} npm install bin/jfrog${{ matrix.suite.osSuffix }} --version if: steps.npm-changed-files.outputs.any_changed == 'false'