From 4ad501cbd105242d47d1c649f3d23d32d9996d87 Mon Sep 17 00:00:00 2001 From: Hailong Cui Date: Sat, 14 Sep 2024 09:47:53 +0800 Subject: [PATCH 1/3] upgrade upload-artifact to version 4 Signed-off-by: Hailong Cui --- .github/workflows/bwc-test-workflow.yml | 2 +- .github/workflows/docker-security-test-workflow.yml | 4 ++-- .github/workflows/multi-node-test-workflow.yml | 2 +- .github/workflows/security-test-workflow.yml | 2 +- .github/workflows/test-and-build-workflow.yml | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bwc-test-workflow.yml b/.github/workflows/bwc-test-workflow.yml index 656aea4cc..ac758c14d 100644 --- a/.github/workflows/bwc-test-workflow.yml +++ b/.github/workflows/bwc-test-workflow.yml @@ -26,7 +26,7 @@ jobs: echo "Running backwards compatibility tests..." ./gradlew bwcTestSuite - name: Upload failed logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: logs diff --git a/.github/workflows/docker-security-test-workflow.yml b/.github/workflows/docker-security-test-workflow.yml index 6511ebfec..5cc00987a 100644 --- a/.github/workflows/docker-security-test-workflow.yml +++ b/.github/workflows/docker-security-test-workflow.yml @@ -84,7 +84,7 @@ jobs: echo "Security plugin is NOT available skipping this run as tests without security have already been run" fi - name: Upload failed logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: logs @@ -96,7 +96,7 @@ jobs: - name: Tar logs run: tar cvzf ./logs.tgz ./logs - name: Upload logs to GitHub - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: logs.tgz diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index f23add7cd..b2539afe9 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -53,7 +53,7 @@ jobs: chown -R 1000:1000 `pwd` su `id -un 1000` -c "./gradlew integTest -PnumNodes=3 ${{ env.TEST_FILTER }}" - name: Upload failed logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: logs diff --git a/.github/workflows/security-test-workflow.yml b/.github/workflows/security-test-workflow.yml index d88750bda..dfe5d2eec 100644 --- a/.github/workflows/security-test-workflow.yml +++ b/.github/workflows/security-test-workflow.yml @@ -42,7 +42,7 @@ jobs: chown -R 1000:1000 `pwd` su `id -un 1000` -c "./gradlew integTest -Dsecurity=true -Dhttps=true --tests '*IT'" - name: Upload failed logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: logs diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index 73c24da42..e7115e63c 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -56,7 +56,7 @@ jobs: chown -R 1000:1000 `pwd` su `id -un 1000` -c "./gradlew build ${{ env.TEST_FILTER }}" - name: Upload failed logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ failure() }} with: name: logs @@ -71,7 +71,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} # This step uses the upload-artifact Github action: https://github.com/actions/upload-artifact - name: Upload Artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: index-management-plugin-ubuntu-latest path: index-management-artifacts @@ -127,7 +127,7 @@ jobs: cp ./build/distributions/*.zip index-management-artifacts # This step uses the upload-artifact Github action: https://github.com/actions/upload-artifact - name: Upload Artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: index-management-plugin-${{ matrix.os }} path: index-management-artifacts From 5e2f873c46092149bb0783f914cf77f712314d9c Mon Sep 17 00:00:00 2001 From: Hailong Cui Date: Sat, 14 Sep 2024 13:28:29 +0800 Subject: [PATCH 2/3] add overwrite as true Signed-off-by: Hailong Cui --- .github/workflows/bwc-test-workflow.yml | 1 + .github/workflows/docker-security-test-workflow.yml | 2 ++ .github/workflows/multi-node-test-workflow.yml | 1 + .github/workflows/security-test-workflow.yml | 1 + .github/workflows/test-and-build-workflow.yml | 8 +++++--- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bwc-test-workflow.yml b/.github/workflows/bwc-test-workflow.yml index ac758c14d..dc905d65d 100644 --- a/.github/workflows/bwc-test-workflow.yml +++ b/.github/workflows/bwc-test-workflow.yml @@ -30,4 +30,5 @@ jobs: if: failure() with: name: logs + overwrite: 'true' path: build/testclusters/indexmanagementBwcCluster*/logs/* diff --git a/.github/workflows/docker-security-test-workflow.yml b/.github/workflows/docker-security-test-workflow.yml index 5cc00987a..de3d83ea9 100644 --- a/.github/workflows/docker-security-test-workflow.yml +++ b/.github/workflows/docker-security-test-workflow.yml @@ -88,6 +88,7 @@ jobs: if: failure() with: name: logs + overwrite: 'true' path: build/testclusters/integTest-*/logs/* - name: Collect docker logs on failure uses: jwalton/gh-docker-logs@v2 @@ -100,4 +101,5 @@ jobs: if: failure() with: name: logs.tgz + overwrite: 'true' path: ./logs.tgz diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index b2539afe9..0760b8831 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -57,4 +57,5 @@ jobs: if: failure() with: name: logs + overwrite: 'true' path: build/testclusters/integTest-*/logs/* diff --git a/.github/workflows/security-test-workflow.yml b/.github/workflows/security-test-workflow.yml index dfe5d2eec..3c5829983 100644 --- a/.github/workflows/security-test-workflow.yml +++ b/.github/workflows/security-test-workflow.yml @@ -46,4 +46,5 @@ jobs: if: failure() with: name: logs + overwrite: 'true' path: build/testclusters/integTest-*/logs/* diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index e7115e63c..ca27b52d2 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -59,7 +59,7 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ failure() }} with: - name: logs + name: logs-${{ matrix.java }}-${{ matrix.feature }} path: build/testclusters/integTest-*/logs/* - name: Create Artifact Path run: | @@ -73,8 +73,9 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: index-management-plugin-ubuntu-latest + name: index-management-plugin-ubuntu-latest-${{ matrix.java }} path: index-management-artifacts + overwrite: 'true' test-and-build-windows-macos: env: @@ -129,5 +130,6 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: index-management-plugin-${{ matrix.os }} + name: index-management-plugin-${{ matrix.os }}-${{ matrix.java }} path: index-management-artifacts + overwrite: 'true' From dff4c7e286c6d4aaa5064f2666953d6e3939b01d Mon Sep 17 00:00:00 2001 From: Hailong Cui Date: Mon, 16 Sep 2024 22:52:13 +0800 Subject: [PATCH 3/3] use v3 as v4 need node.js 20 Signed-off-by: Hailong Cui --- .github/workflows/multi-node-test-workflow.yml | 2 +- .github/workflows/security-test-workflow.yml | 2 +- .github/workflows/test-and-build-workflow.yml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index 0760b8831..e3c1bb911 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -53,7 +53,7 @@ jobs: chown -R 1000:1000 `pwd` su `id -un 1000` -c "./gradlew integTest -PnumNodes=3 ${{ env.TEST_FILTER }}" - name: Upload failed logs - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 if: failure() with: name: logs diff --git a/.github/workflows/security-test-workflow.yml b/.github/workflows/security-test-workflow.yml index 3c5829983..8dc6eb19c 100644 --- a/.github/workflows/security-test-workflow.yml +++ b/.github/workflows/security-test-workflow.yml @@ -42,7 +42,7 @@ jobs: chown -R 1000:1000 `pwd` su `id -un 1000` -c "./gradlew integTest -Dsecurity=true -Dhttps=true --tests '*IT'" - name: Upload failed logs - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 if: failure() with: name: logs diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index ca27b52d2..a5dc4c0cb 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -71,7 +71,8 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} # This step uses the upload-artifact Github action: https://github.com/actions/upload-artifact - name: Upload Artifacts - uses: actions/upload-artifact@v4 + # v4 requires node.js 20 which is not supported + uses: actions/upload-artifact@v3 with: name: index-management-plugin-ubuntu-latest-${{ matrix.java }} path: index-management-artifacts