fix: github actions and Jenkinsfile build

jenkinsci · Nov 13, 2024 · 9bd8850 · 9bd8850
1 parent aac6a65
commit 9bd8850
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml
@@ -14,14 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
     - name: Build with Maven
       working-directory: .
-      run: mvn -B package 
+      run: mvn -B package -DargLine="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
 
   build-docker:
     runs-on: ubuntu-latest
@@ -67,16 +67,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - alias: jre-11
-            dockerfile: packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile
-            tag-prefix: eclipse-temurin-11-jre-
+          - alias: jre-17
+            dockerfile: packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile
+            tag-prefix: eclipse-temurin-17-jre-
             tag-latest: true
-            extra-tags: ", ghcr.io/${{ github.repository }}:jre-11"
-          - alias: jre-11-alpine
-            dockerfile: packaging/docker/unix/eclipse-temurin-11-jre-alpine/Dockerfile
-            tag-prefix: eclipse-temurin-11-jre-alpine-
+            extra-tags: ", ghcr.io/${{ github.repository }}:jre-17"
+          - alias: jre-17-alpine
+            dockerfile: packaging/docker/unix/eclipse-temurin-17-jre-alpine/Dockerfile
+            tag-prefix: eclipse-temurin-17-jre-alpine-
             tag-latest: false
-            extra-tags: ", ghcr.io/${{ github.repository }}:alpine, ghcr.io/${{ github.repository }}:jre-11-alpine"
+            extra-tags: ", ghcr.io/${{ github.repository }}:alpine, ghcr.io/${{ github.repository }}:jre-17-alpine"
     needs:
       - build-maven
       - build-docker

diff --git a/.github/workflows/publish-release-artifact.yml b/.github/workflows/publish-release-artifact.yml
@@ -15,10 +15,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: Set version
         id: set-version
@@ -55,14 +55,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - alias: jre-11
-            dockerfile: packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile
-            tag-prefix: eclipse-temurin-11-jre-
-            extra-tags--pattern: ", ghcr.io/${{ github.repository }}:jre-11-$RELEASE_VERSION"
-          - alias: jre-11-alpine
-            dockerfile: packaging/docker/unix/eclipse-temurin-11-jre-alpine/Dockerfile
-            tag-prefix: eclipse-temurin-11-jre-alpine-
-            extra-tags-pattern: ", ghcr.io/${{ github.repository }}:alpine-$RELEASE_VERSION, ghcr.io/${{ github.repository }}:jre-11-alpine-$RELEASE_VERSION"
+          - alias: jre-17
+            dockerfile: packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile
+            tag-prefix: eclipse-temurin-17-jre-
+            extra-tags--pattern: ", ghcr.io/${{ github.repository }}:jre-17-$RELEASE_VERSION"
+          - alias: jre-17-alpine
+            dockerfile: packaging/docker/unix/eclipse-temurin-17-jre-alpine/Dockerfile
+            tag-prefix: eclipse-temurin-17-jre-alpine-
+            extra-tags-pattern: ", ghcr.io/${{ github.repository }}:alpine-$RELEASE_VERSION, ghcr.io/${{ github.repository }}:jre-17-alpine-$RELEASE_VERSION"
     permissions:
       contents: read
       packages: write

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -16,7 +16,7 @@ Map branches = [:]
 for (int i = 0; i < platforms.size(); ++i) {
     String label = platforms[i]
     branches[label] = {
-        node(label + " && docker") {
+        node("docker && linux-amd64") {
             timestamps {
                 ws("platform_${label}_${branchName}_${buildNumber}") {
                     stage('Checkout') {