diff --git a/.github/workflows/bugCatcher.yml b/.github/workflows/bugCatcher.yml index 303c0aae3..15d5c3f5f 100644 --- a/.github/workflows/bugCatcher.yml +++ b/.github/workflows/bugCatcher.yml @@ -81,7 +81,11 @@ jobs: - name: Cache Maven packages uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: - path: ~/.m2 + # Cache only the local repository — caching ~/.m2 itself would + # restore a stale settings.xml on top of the JFrog-configured one + # written above, causing Maven to bypass the mirror and hit Maven + # Central directly. + path: ~/.m2/repository key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 diff --git a/.github/workflows/loggingTesting.yml b/.github/workflows/loggingTesting.yml index 13093ba21..b364f6e02 100644 --- a/.github/workflows/loggingTesting.yml +++ b/.github/workflows/loggingTesting.yml @@ -44,6 +44,7 @@ jobs: java-version: '21' - name: Get JFrog OIDC token + shell: bash run: | set -euo pipefail @@ -70,6 +71,7 @@ jobs: echo "JFrog OIDC token obtained successfully" - name: Configure maven + shell: bash run: | set -euo pipefail diff --git a/.github/workflows/runIntegrationTests.yml b/.github/workflows/runIntegrationTests.yml index 7142b0a27..681302a6a 100644 --- a/.github/workflows/runIntegrationTests.yml +++ b/.github/workflows/runIntegrationTests.yml @@ -85,7 +85,11 @@ jobs: echo "Maven configured to use JFrog registry" - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: - path: ~/.m2 + # Cache only the local repository — caching ~/.m2 itself would + # restore a stale settings.xml on top of the JFrog-configured one + # written above, causing Maven to bypass the mirror and hit Maven + # Central directly. + path: ~/.m2/repository key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Create .pem file from secret