keycloak · ahus1 · Jun 26, 2025 · Jun 18, 2025 · Jun 19, 2025
@@ -40,19 +40,6 @@ runs:
         export VERSION=$(mvn help:evaluate -Dexpression=node.version -q -DforceStdout  | cut -c 2-)
         curl -Lf https://nodejs.org/dist/v${VERSION}/win-x64/node.exe --create-dirs -o ~/.m2/repository/com/github/eirslett/node/${VERSION}/node-${VERSION}-win-x64.exe
 
-    - shell: powershell
-      name: Link the cached Maven repository to the OS-dependent location
-      if: inputs.create-cache-if-it-doesnt-exist == 'false' && runner.os == 'Windows'
-      # The cache restore in the next step uses the relative path which was valid on Linux and that is part of the archive it downloads.
-      # You'll see that path when you enable debugging for the GitHub workflow on Windows.
-      # On Windows, the .m2 folder is in different location, so move all the contents to the right folder here.
-      # Also, not using the C: drive will speed up the build, see https://github.com/actions/runner-images/issues/8755
-      run: |
-        mkdir -p ..\..\..\.m2
-        mkdir -p D:\.m2\repository
-        cmd /c mklink /d $HOME\.m2\repository D:\.m2\repository
-        cmd /c mklink /d $PWD\..\..\..\.m2\repository D:\.m2\repository
-
     - id: restore-maven-repository
       name: Maven cache
       uses: actions/cache/restore@v4
@@ -63,4 +50,13 @@ runs:
           ~/.m2/repository/*/*
           !~/.m2/repository/org/keycloak
         key: ${{ steps.weekly-cache-key.outputs.key }}
-        enableCrossOsArchive: true
+        enableCrossOsArchive: true
+
+    - shell: bash
+      name: Copy restored maven repo to home folder in Windows
+      if: (steps.cache-maven-repository.outputs.cache-hit == 'true' || steps.restore-maven-repository.outputs.cache-hit == 'true') && runner.os == 'Windows'
+      run: |
+        if [ -d ../../../.m2/repository ]; then
+          cp -r ../../../.m2/repository ~/.m2
+          rm -r ../../../.m2/repository
+        fi
@@ -692,16 +692,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - id: unit-test-setup
+        name: Unit test setup
+        uses: ./.github/actions/unit-test-setup
+
       - name: Fake fips
         run: |
           cd .github/fake_fips
           make
           sudo insmod fake_fips.ko
 
-      - id: unit-test-setup
-        name: Unit test setup
-        uses: ./.github/actions/unit-test-setup
-
       - name: Run crypto tests
         run: docker run --rm --workdir /github/workspace -v "${{ github.workspace }}":"/github/workspace" -v "$HOME/.m2":"/root/.m2" registry.access.redhat.com/ubi8/ubi:latest .github/scripts/run-fips-ut.sh
 
@@ -727,18 +727,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Fake fips
-        run: |
-          cd .github/fake_fips
-          make
-          sudo insmod fake_fips.ko
-
       - id: integration-test-setup
         name: Integration test setup
         uses: ./.github/actions/integration-test-setup
         with:
           jdk-version: 21
 
+      - name: Fake fips
+        run: |
+          cd .github/fake_fips
+          make
+          sudo insmod fake_fips.ko
+
       - name: Run base tests
         run: docker run --rm --workdir /github/workspace -e "SUREFIRE_RERUN_FAILING_COUNT" -v "${{ github.workspace }}":"/github/workspace" -v "$HOME/.m2":"/root/.m2" registry.access.redhat.com/ubi8/ubi:latest .github/scripts/run-fips-it.sh ${{ matrix.mode }}