gunnarmorling#540 Cache SDKman

IMPORTANT: Only use SDKman provided Java - System JDK no longer installed!
ascheman · Jan 22, 2024 · 2e5565e · 2e5565e
1 parent c9ac44d
commit 2e5565e
Showing 1 changed file with 19 additions and 29 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -17,11 +17,10 @@
 name: Build
 
 on:
-  # TODO drop this for final change
+  # Enable manual re-run
   workflow_dispatch: { }
   push:
-  # TODO restore this for final change
-  #    branches: [ main ]
+    branches: [ main ]
   pull_request:
     branches: [ main ]
 
@@ -35,32 +34,6 @@ jobs:
         with:
           submodules: 'true'
 
-      - name: 'Setup SDKMAN'
-        uses: sdkman/sdkman-action@b1f9b696c79148b66d3d3a06f7ea801820318d0f
-        id: sdkman
-      # TODO restore this for final change
-      #        if: github.event_name == 'pull_request'
-
-      - name: 'Setup Java SDK'
-        shell: bash
-        run: |
-          source "$HOME/.sdkman/bin/sdkman-init.sh"
-          echo "Y" | sdk install java 21.0.1-tem
-          ls -l "$HOME/.sdkman/candidates/java"
-
-      - name: 'Build project'
-        run: mvn -B clean verify -Pci
-
-      - name: 'Test submission'
-        shell: bash
-        # TODO restore this for final change
-        run: |
-          source "$HOME/.sdkman/bin/sdkman-init.sh"
-          echo "n" | sdk install java 21.0.2-graal
-          ls -l "$HOME/.sdkman/candidates/java"
-#          ./test_ci.sh ${{ github.event.pull_request.user.login }}
-      #        if: github.event_name == 'pull_request'
-
       - name: Cache SDKMan
         id: cache-sdkman
         uses: actions/cache@v4
@@ -75,3 +48,20 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
+      - name: 'Setup SDKMAN'
+        uses: sdkman/sdkman-action@b1f9b696c79148b66d3d3a06f7ea801820318d0f
+        id: sdkman
+
+      - name: 'Build project'
+        run: |
+          source "$HOME/.sdkman/bin/sdkman-init.sh"
+          ./mvnw --version
+          ./mvnw -B clean verify -Pci
+
+      - name: 'Test submission'
+        shell: bash
+        run: |
+          ./test_ci.sh ${{ github.event.pull_request.user.login }}
+        if: github.event_name == 'pull_request'
+
+