From 6a7d1d556e5dfdee3d717a45846e86154d912b96 Mon Sep 17 00:00:00 2001 From: Simon Thulbourn Date: Wed, 7 May 2025 10:52:23 +0000 Subject: [PATCH 1/4] fix(ci): minor fixes for workflows --- .github/workflows/check-e2e.yml | 2 +- .github/workflows/security-dependencies-check.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-e2e.yml b/.github/workflows/check-e2e.yml index 6420cd6f7..72b0af606 100644 --- a/.github/workflows/check-e2e.yml +++ b/.github/workflows/check-e2e.yml @@ -68,4 +68,4 @@ jobs: role-to-assume: ${{ secrets.AWS_IAM_ROLE }} aws-region: us-east-1 - name: Run e2e test with Maven - run: mvn -DskipTests install --file pom.xml && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml \ No newline at end of file + run: JAVA_VERSION=${{ matrix.java }} mvn -DskipTests install --file pom.xml && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml \ No newline at end of file diff --git a/.github/workflows/security-dependencies-check.yml b/.github/workflows/security-dependencies-check.yml index 9c588d9be..94cd34405 100644 --- a/.github/workflows/security-dependencies-check.yml +++ b/.github/workflows/security-dependencies-check.yml @@ -36,4 +36,5 @@ jobs: - name: Verify Contents uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0 with: - config-file: './.github/dependency-review-config.yml' \ No newline at end of file + config-file: './.github/dependency-review-config.yml' + head-ref: ${{ github.ref }} \ No newline at end of file From c178f404f12dfe9ad8aefb87f18f819be77fb6eb Mon Sep 17 00:00:00 2001 From: Simon Thulbourn Date: Wed, 7 May 2025 12:59:34 +0200 Subject: [PATCH 2/4] Update .github/workflows/check-e2e.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/check-e2e.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-e2e.yml b/.github/workflows/check-e2e.yml index 72b0af606..3a0fab656 100644 --- a/.github/workflows/check-e2e.yml +++ b/.github/workflows/check-e2e.yml @@ -68,4 +68,6 @@ jobs: role-to-assume: ${{ secrets.AWS_IAM_ROLE }} aws-region: us-east-1 - name: Run e2e test with Maven - run: JAVA_VERSION=${{ matrix.java }} mvn -DskipTests install --file pom.xml && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml \ No newline at end of file + env: + JAVA_VERSION: ${{ matrix.java }} + run: mvn -DskipTests install --file pom.xml && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml \ No newline at end of file From db025dee34432124e293e6650023c0afc61f41a2 Mon Sep 17 00:00:00 2001 From: Simon Thulbourn Date: Wed, 7 May 2025 12:59:43 +0200 Subject: [PATCH 3/4] Update .github/workflows/security-dependencies-check.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/security-dependencies-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/security-dependencies-check.yml b/.github/workflows/security-dependencies-check.yml index 94cd34405..4fb2f6229 100644 --- a/.github/workflows/security-dependencies-check.yml +++ b/.github/workflows/security-dependencies-check.yml @@ -37,4 +37,4 @@ jobs: uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0 with: config-file: './.github/dependency-review-config.yml' - head-ref: ${{ github.ref }} \ No newline at end of file + head-ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref_name }} \ No newline at end of file From 401ca5c1e1a8576c3ee44c5c5c4aa1c5eb86f3cb Mon Sep 17 00:00:00 2001 From: Simon Thulbourn Date: Wed, 7 May 2025 11:04:44 +0000 Subject: [PATCH 4/4] set base ref --- .github/workflows/security-dependencies-check.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/security-dependencies-check.yml b/.github/workflows/security-dependencies-check.yml index 4fb2f6229..5ed99b376 100644 --- a/.github/workflows/security-dependencies-check.yml +++ b/.github/workflows/security-dependencies-check.yml @@ -37,4 +37,5 @@ jobs: uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0 with: config-file: './.github/dependency-review-config.yml' - head-ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref_name }} \ No newline at end of file + head-ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref_name }} + base-ref: ${{ github.event_name == 'pull_request' && github.base_ref || github.ref_name }} \ No newline at end of file