Use GA for java setup and Maven caching

Jakuje · Apr 2, 2024 · a3e68bb · a3e68bb
1 parent 717d5a6
commit a3e68bb
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 7 deletions.
diff --git a/.github/setup-java.sh b/.github/setup-java.sh
@@ -2,12 +2,15 @@
 
 set -ex -o xtrace
 
-# Select the right java
-sudo update-java-alternatives -s java-1.8.0-openjdk-amd64
-sudo update-alternatives --get-selections | grep ^java
-export PATH="/usr/lib/jvm/java-8-openjdk-amd64/bin/:$PATH"
-export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
-env | grep -i openjdk
+# github already selected the right java in https://github.com/actions/setup-java
+if [ -z "$GITHUB_ACTIONS" ]; then
+	# Select the right java
+	sudo update-java-alternatives -s java-1.8.0-openjdk-amd64
+	sudo update-alternatives --get-selections | grep ^java
+	export PATH="/usr/lib/jvm/java-8-openjdk-amd64/bin/:$PATH"
+	export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
+fi
+env | grep -i JAVA
 
 # VSmartcard
 ./.github/setup-vsmartcard.sh
@@ -25,7 +28,7 @@ if [ ! -d "jcardsim" ]; then
 	git clone https://github.com/Jakuje/jcardsim.git
 fi
 pushd jcardsim
-env | grep -i openjdk
+env | grep -i JAVA
 export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
 if [ ! -f target/jcardsim-3.0.5-SNAPSHOT.jar ]; then
 	mvn initialize && mvn clean install

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -187,6 +187,12 @@ jobs:
         with:
           path: ./*
           key: ${{ runner.os }}-${{ github.sha }}
+      - run: git clone https://github.com/Jakuje/jcardsim.git
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'semeru'
+          java-version: '8'
+          cache: 'maven'
       - run: .github/setup-linux.sh piv
       - run: .github/test-piv.sh
       - run: .github/test-piv.sh valgrind
@@ -206,6 +212,12 @@ jobs:
         with:
           path: ./*
           key: ${{ runner.os }}-piv-sm-${{ github.sha }}
+      - run: git clone https://github.com/Jakuje/jcardsim.git
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'semeru'
+          java-version: '8'
+          cache: 'maven'
       - run: .github/setup-linux.sh piv
       - run: .github/test-piv.sh
       - run: .github/test-piv.sh valgrind
@@ -220,6 +232,11 @@ jobs:
           packages: ${{ env.BASE_DEPS }}
           version: apt-20-base
           execute_install_scripts: true
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'semeru'
+          java-version: '8'
+          cache: 'maven'
       - uses: actions/cache@v3
         id: cache-build
         with:
@@ -244,6 +261,12 @@ jobs:
         with:
           path: ./*
           key: ${{ runner.os }}-${{ github.sha }}
+      - run: git clone https://github.com/Jakuje/jcardsim.git
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'semeru'
+          java-version: '8'
+          cache: 'maven'
       - run: .github/setup-linux.sh isoapplet
       - run: .github/test-isoapplet.sh v1
       - run: .github/test-isoapplet.sh v1 valgrind
@@ -263,6 +286,12 @@ jobs:
         with:
           path: ./*
           key: ${{ runner.os }}-${{ github.sha }}
+      - run: git clone https://github.com/Jakuje/jcardsim.git
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'semeru'
+          java-version: '8'
+          cache: 'maven'
       - run: .github/setup-linux.sh gidsapplet
       - run: .github/test-gidsapplet.sh
       - run: .github/test-gidsapplet.sh valgrind
@@ -282,6 +311,12 @@ jobs:
         with:
           path: ./*
           key: ${{ runner.os }}-${{ github.sha }}
+      - run: git clone https://github.com/Jakuje/jcardsim.git
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'semeru'
+          java-version: '8'
+          cache: 'maven'
       - run: .github/setup-linux.sh openpgp
       - run: .github/test-openpgp.sh
       - run: .github/test-openpgp.sh valgrind
@@ -417,6 +452,12 @@ jobs:
         with:
           path: ./*
           key: ${{ runner.os }}-22-piv-sm-${{ github.sha }}
+      - run: git clone https://github.com/Jakuje/jcardsim.git
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'semeru'
+          java-version: '8'
+          cache: 'maven'
       - run: .github/setup-linux.sh piv
       - run: .github/test-piv.sh
       - run: .github/test-piv.sh valgrind