chore: Update Maven command in workflows to remove unnecessary options

SoftInstigate · Sep 3, 2024 · 5177f37 · 5177f37
1 parent 012c86d
commit 5177f37
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -48,7 +48,7 @@ jobs:
         if: ${{ ! matrix.deploy }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
-        run: mvn -B clean verify -Dmongodb.version="${{ matrix.mongodb-version }}" -Dkarate.options="${{ matrix.karate-options }}"
+        run: mvn -B clean verify -Dmongodb.version="${{ matrix.mongodb-version }}"
 
       - name: Import private gpg key
         if: ${{ matrix.deploy }}
@@ -62,7 +62,7 @@ jobs:
         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
+          mvn -B deploy -Pdeploy -Dmongodb.version="${{ matrix.mongodb-version }}" -s settings.xml 
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
@@ -105,6 +105,9 @@ jobs:
         with:
           context: ./core/
           file: ./core/Dockerfile.graalvm
+          platforms: |
+            linux/amd64,
+            linux/arm64
           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

diff --git a/.github/workflows/pullrequests.yml b/.github/workflows/pullrequests.yml
@@ -37,5 +37,4 @@ jobs:
         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 }}"
+          mvn -B clean verify -Dmongodb.version="${{ matrix.mongodb-version }}"
diff --git a/.github/workflows/tags.yml b/.github/workflows/tags.yml
@@ -47,8 +47,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
         run: |
-          mvn -B clean verify -Dmongodb.version="${{ matrix.mongodb-version }}" \
-           -Dkarate.options="${{ matrix.karate-options }}"
+          mvn -B clean verify -Dmongodb.version="${{ matrix.mongodb-version }}"
 
       - name: Import private gpg key
         if: ${{ matrix.deploy }}
@@ -61,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 -Dmongodb.version="${{ matrix.mongodb-version }}" -s settings.xml
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
@@ -107,6 +108,9 @@ jobs:
         with:
           context: ./core/
           file: ./core/Dockerfile.graalvm
+          platforms: |
+            linux/amd64,
+            linux/arm64
           push: true # push all images built
           pull: true # pull all required images before building
           tags: |