From ea72e8631d69e1daf368b5e3eacff6e443a4649b Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 4 Dec 2024 16:04:14 -0500 Subject: [PATCH 1/5] Upgrade to upload-artifact v4 Signed-off-by: Craig Perkins --- .github/workflows/bwc-test-workflow.yml | 2 +- .github/workflows/multi-node-test-workflow.yml | 4 +--- .github/workflows/test-workflow.yml | 10 ++++------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/bwc-test-workflow.yml b/.github/workflows/bwc-test-workflow.yml index bf8e8ff7c..ef461998b 100644 --- a/.github/workflows/bwc-test-workflow.yml +++ b/.github/workflows/bwc-test-workflow.yml @@ -29,7 +29,7 @@ jobs: # this image tag is subject to change as more dependencies and updates will arrive over time image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }} # need to switch to root so that github actions can install runner binary on container without permission issues. - options: --user root + options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: # This step uses the checkout Github action: https://github.com/actions/checkout diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index fa74c70d8..4b208469f 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -7,8 +7,6 @@ on: push: branches: - "*" -env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true jobs: Get-CI-Image-Tag: @@ -30,7 +28,7 @@ jobs: # this image tag is subject to change as more dependencies and updates will arrive over time image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }} # need to switch to root so that github actions can install runner binary on container without permission issues. - options: --user root + ooptions: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: # This step uses the setup-java Github action: https://github.com/actions/setup-java diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index e539d04f9..4758a68be 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -7,8 +7,6 @@ on: push: branches: - "*" -env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true jobs: Get-CI-Image-Tag: @@ -33,7 +31,7 @@ jobs: # this image tag is subject to change as more dependencies and updates will arrive over time image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }} # need to switch to root so that github actions can install runner binary on container without permission issues. - options: --user root + options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: # This step uses the checkout Github action: https://github.com/actions/checkout @@ -54,12 +52,12 @@ jobs: cp ./alerting/build/distributions/*.zip alerting-artifacts # This step uses the codecov-action Github action: https://github.com/codecov/codecov-action - name: Upload Coverage Report - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: 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@v3 + uses: actions/upload-artifact@v4 with: name: alerting-plugin-${{ matrix.os }} path: alerting-artifacts @@ -107,7 +105,7 @@ jobs: cp ./alerting/build/distributions/*.zip alerting-artifacts # This step uses the upload-artifact Github action: https://github.com/actions/upload-artifact - name: Upload Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: alerting-plugin-${{ matrix.os }} path: alerting-artifacts From 97ab274c92b6a13273d3411763fe1370fc907b0a Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 4 Dec 2024 16:21:57 -0500 Subject: [PATCH 2/5] Upgrade actions/checkout to v4 Signed-off-by: Craig Perkins --- .github/workflows/auto-release.yml | 2 +- .github/workflows/bwc-test-workflow.yml | 2 +- .github/workflows/maven-publish.yml | 2 +- .github/workflows/multi-node-test-workflow.yml | 2 +- .github/workflows/security-test-workflow.yml | 2 +- .github/workflows/test-workflow.yml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 24eeb2730..93f22c2a3 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -22,7 +22,7 @@ jobs: - name: Get tag id: tag uses: dawidd6/action-get-tag@v1 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ncipollo/release-action@v1 with: github_token: ${{ steps.github_app_token.outputs.token }} diff --git a/.github/workflows/bwc-test-workflow.yml b/.github/workflows/bwc-test-workflow.yml index ef461998b..127b8b9ee 100644 --- a/.github/workflows/bwc-test-workflow.yml +++ b/.github/workflows/bwc-test-workflow.yml @@ -34,7 +34,7 @@ jobs: steps: # This step uses the checkout Github action: https://github.com/actions/checkout - name: Checkout Branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 # This step uses the setup-java Github action: https://github.com/actions/setup-java - name: Set Up JDK ${{ matrix.java }} uses: actions/setup-java@v1 diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index e822e15cb..55fce8159 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -27,7 +27,7 @@ jobs: with: distribution: temurin # Temurin is a distribution of adoptium java-version: ${{ matrix.jdk }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: aws-actions/configure-aws-credentials@v1 with: role-to-assume: ${{ secrets.PUBLISH_SNAPSHOTS_ROLE }} diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index 4b208469f..63cafee83 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -38,7 +38,7 @@ jobs: java-version: ${{ matrix.java }} # This step uses the checkout Github action: https://github.com/actions/checkout - name: Checkout Branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run integration tests with multi node config run: | chown -R 1000:1000 `pwd` diff --git a/.github/workflows/security-test-workflow.yml b/.github/workflows/security-test-workflow.yml index 31f7ba9ff..1e9a0d67d 100644 --- a/.github/workflows/security-test-workflow.yml +++ b/.github/workflows/security-test-workflow.yml @@ -25,7 +25,7 @@ jobs: java-version: ${{ matrix.java }} # This step uses the checkout Github action: https://github.com/actions/checkout - name: Checkout Branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 # This step uses the setup-java Github action: https://github.com/actions/setup-java - name: Set Up JDK ${{ matrix.java }} uses: actions/setup-java@v1 diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 4758a68be..482024ffe 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -36,7 +36,7 @@ jobs: steps: # This step uses the checkout Github action: https://github.com/actions/checkout - name: Checkout Branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 # This step uses the setup-java Github action: https://github.com/actions/setup-java - name: Set Up JDK ${{ matrix.java }} uses: actions/setup-java@v1 @@ -83,7 +83,7 @@ jobs: steps: # This step uses the checkout Github action: https://github.com/actions/checkout - name: Checkout Branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 # This is a hack, but this step creates a link to the X: mounted drive, which makes the path # short enough to work on Windows - name: Shorten Path From 99d82e86430057f0e04a418f625e3eb1bdaafc58 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 4 Dec 2024 16:29:35 -0500 Subject: [PATCH 3/5] Add run-start-commands Signed-off-by: Craig Perkins --- .github/workflows/bwc-test-workflow.yml | 2 ++ .github/workflows/multi-node-test-workflow.yml | 2 ++ .github/workflows/test-workflow.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/bwc-test-workflow.yml b/.github/workflows/bwc-test-workflow.yml index 127b8b9ee..e6230bce3 100644 --- a/.github/workflows/bwc-test-workflow.yml +++ b/.github/workflows/bwc-test-workflow.yml @@ -32,6 +32,8 @@ jobs: options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: + - name: Run start commands + run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }} # This step uses the checkout Github action: https://github.com/actions/checkout - name: Checkout Branch uses: actions/checkout@v4 diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index 63cafee83..85b9fb168 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -31,6 +31,8 @@ jobs: ooptions: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: + - name: Run start commands + run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }} # This step uses the setup-java Github action: https://github.com/actions/setup-java - name: Set Up JDK ${{ matrix.java }} uses: actions/setup-java@v1 diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 482024ffe..b228060d6 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -34,6 +34,8 @@ jobs: options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: + - name: Run start commands + run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }} # This step uses the checkout Github action: https://github.com/actions/checkout - name: Checkout Branch uses: actions/checkout@v4 From bc8349e64c30411e45cacde05cadcc249fb1b4d9 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 4 Dec 2024 17:04:07 -0500 Subject: [PATCH 4/5] Set overwrite to true Signed-off-by: Craig Perkins --- .github/workflows/test-workflow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index b228060d6..171ca88c3 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -63,6 +63,7 @@ jobs: with: name: alerting-plugin-${{ matrix.os }} path: alerting-artifacts + overwrite: true build: needs: Get-CI-Image-Tag @@ -111,3 +112,4 @@ jobs: with: name: alerting-plugin-${{ matrix.os }} path: alerting-artifacts + overwrite: true From 5d17cbdfb218c0e9efec95885424a816f91261cf Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 5 Dec 2024 11:28:39 -0500 Subject: [PATCH 5/5] Only run with jdk 21 Signed-off-by: Craig Perkins --- .github/workflows/security-test-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/security-test-workflow.yml b/.github/workflows/security-test-workflow.yml index 1e9a0d67d..bfa1e0fa3 100644 --- a/.github/workflows/security-test-workflow.yml +++ b/.github/workflows/security-test-workflow.yml @@ -12,7 +12,7 @@ jobs: build: strategy: matrix: - java: [ 21, 23 ] + java: [ 21 ] # Job name name: Build and test Alerting # This job runs on Linux