Update docker build platforms

SoftInstigate · Sep 3, 2024 · a79cdb3 · a79cdb3
1 parent c8e68e6
commit a79cdb3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -60,7 +60,9 @@ jobs:
 
       - name: Deploy to Maven Central
         if: ${{ matrix.deploy }}
-        run: MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED" mvn -B deploy -Pdeploy -s settings.xml
+        run: |
+          MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED" \
+          mvn -B deploy -Pdeploy -s settings.xml
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
@@ -87,11 +89,17 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: ./core/
-          platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x
+          platforms: |
+            linux/amd64,
+            linux/arm64,
+            linux/ppc64le,
+            linux/s390x
           push: true # push all images built
           pull: true # pull all required images before building
           # NOTE: snapshot images must be tagged with "latest" in master branch only
-          tags: softinstigate/restheart-snapshot:latest,softinstigate/restheart-snapshot:${{steps.vars.outputs.SHA}}
+          tags: |
+            softinstigate/restheart-snapshot:latest,
+            softinstigate/restheart-snapshot:${{steps.vars.outputs.SHA}}
 
       - name: Build and Push GraalVM Docker image
         if: ${{ matrix.deploy }}
@@ -102,15 +110,23 @@ jobs:
           push: true # push all images built
           pull: true # pull all required images before building
           # NOTE: snapshot images must be tagged with "graalvm" in master branch only
-          tags: softinstigate/restheart-snapshot:graalvm,softinstigate/restheart-snapshot:${{steps.vars.outputs.SHA}}-graalvm
+          tags: |
+            softinstigate/restheart-snapshot:graalvm,
+            softinstigate/restheart-snapshot:${{steps.vars.outputs.SHA}}-graalvm
 
       - name: Build and Push distroless docker image
         if: ${{ matrix.deploy }}
         uses: docker/build-push-action@v6
         with:
           context: ./core/
           file: ./core/Dockerfile.distroless
+          platforms: |
+            linux/amd64,
+            linux/arm64,
+            linux/ppc64le
           push: true # push all images built
           pull: true # pull all required images before building
           # NOTE: snapshot images must be tagged with "distroless" in master branch only
-          tags: softinstigate/restheart-snapshot:distroless,softinstigate/restheart-snapshot:${{steps.vars.outputs.SHA}}-distroless
+          tags: |
+            softinstigate/restheart-snapshot:distroless,
+            softinstigate/restheart-snapshot:${{steps.vars.outputs.SHA}}-distroless
diff --git a/.github/workflows/pullrequests.yml b/.github/workflows/pullrequests.yml
@@ -17,7 +17,6 @@ jobs:
           - mongodb-version: "5.0"
           - mongodb-version: "6.0"
           - mongodb-version: "7.0"
-            deploy: true
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
@@ -37,4 +36,6 @@ jobs:
       - name: Build and Test
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
-        run: MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED" mvn -B clean verify -Dmongodb.version="${{ matrix.mongodb-version }}" -Dkarate.options="${{ matrix.karate-options }}"
+        run: |
+          MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED" \
+          mvn -B clean verify -Dmongodb.version="${{ matrix.mongodb-version }}" -Dkarate.options="${{ matrix.karate-options }}"