Fix Github actions

Blazebit · Jan 7, 2025 · b6d0b9e · b6d0b9e
1 parent a8356f5
commit b6d0b9e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,29 +12,17 @@ jobs:
 # When GitHub Actions supports it: https://github.com/actions/toolkit/issues/399
 # We will use the experimental flag as indicator whether a failure should cause a workflow failure
         include:
-          - jdk: 8
-          - jdk: 11
-          - jdk: 16
-          - jdk: 11
-            build-jdk: 11
           - jdk: 17
             build-jdk: 17
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Java 8
-        uses: AdoptOpenJDK/install-jdk@v1
-        with:
-          version: 8
-          targets: JDK8_HOME;JAVA_HOME
       - name: Download Requested JDK
         uses: actions/setup-java@v3
-        if: ${{ matrix.jdk != 8 }}
         with:
           java-version: ${{ matrix.jdk }}
           distribution: temurin
       - name: Set up Requested JDK
         uses: actions/setup-java@v3
-        if: ${{ matrix.jdk != 8 }}
         with:
           java-version: ${{ matrix.jdk }}
           distribution: temurin
@@ -57,14 +45,13 @@ jobs:
 
       - name: Run build script
         env:
-          JDK8_HOME: ${{ env.JDK8_HOME }}
           JDK: ${{ matrix.jdk }}
           BUILD_JDK: ${{ matrix.build-jdk }}
         run: ./ci/build-github.sh
         shell: bash
 
       - name: Upload test reports (if Maven failed)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-reports-jdk${{ matrix.jdk }}-build-jdk${{ matrix.build-jdk }}

diff --git a/.github/workflows/publish-snapshot.yaml b/.github/workflows/publish-snapshot.yaml
@@ -11,11 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Java 8
-        uses: AdoptOpenJDK/install-jdk@v1
-        with:
-          version: 8
-          targets: JDK8_HOME;JAVA_HOME
       - name: Download JDK 17
         uses: actions/setup-java@v3
         with:
@@ -43,4 +38,4 @@ jobs:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         run: ./ci/deploy-snapshot.sh
-        shell: bash
+        shell: bash
diff --git a/ci/deploy-snapshot.sh b/ci/deploy-snapshot.sh
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 echo "Starting snapshot deployment..."
 export MAVEN_OPTS="$MAVEN_OPTS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-exec $DIR/../mvnw -B -P "blazebit-release" -s $DIR/deploy-settings.xml -DperformRelease -DskipTests -DskipNpmDeploy -Dgpg.skip=true -Dquiet=true -Djdk8.home=$JDK8_HOME clean deploy
+exec $DIR/../mvnw -B -P "blazebit-release" -s $DIR/deploy-settings.xml -DperformRelease -DskipTests -DskipNpmDeploy -Dgpg.skip=true -Dquiet=true clean deploy