Force compatibility machine target

- We're mostly getting issues with macos runners where -march=compatibility looks to work better but is not automatically set depending which cpu arch is in use.
jvalkeal · May 7, 2024 · cbc0632 · cbc0632
1 parent 2b18de0
commit cbc0632
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 16 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -11,20 +11,25 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - nickname: win
-            os: windows-2022
-            graal: latest
-            musl: false
+          # - nickname: win
+          #   os: windows-2022
+          #   graal: latest
+          #   musl: false
           - nickname: macos
             os: macos-12
             graal: latest
             musl: false
-          - nickname: linux
-            os: ubuntu-22.04
-            graal: latest
-            musl: true
+          # - nickname: linux
+          #   os: ubuntu-22.04
+          #   graal: latest
+          #   musl: true
     name: Compile ${{ matrix.nickname }}
     steps:
+      - name: macos info
+        if: runner.os == 'macOS'
+        shell: bash
+        run: |
+          sysctl machdep.cpu
       - uses: actions/checkout@v3
       - uses: graalvm/setup-graalvm@v1
         with:
@@ -65,18 +70,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: windows-2022
-            nickname: win
+          # - os: windows-2022
+          #   nickname: win
           # - os: windows-2019
           #   nickname: win
           - os: macos-12
             nickname: macos
           - os: macos-11
             nickname: macos
-          - os: ubuntu-22.04
-            nickname: linux
-          - os: ubuntu-20.04
-            nickname: linux
+          # - os: ubuntu-22.04
+          #   nickname: linux
+          # - os: ubuntu-20.04
+          #   nickname: linux
     name: E2E ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -101,6 +106,11 @@ jobs:
         with:
           name: spring-shell-samples-${{ matrix.nickname }}
           path: spring-shell-samples
+      - name: macos info
+        if: runner.os == 'macOS'
+        shell: bash
+        run: |
+          sysctl machdep.cpu
       - name: fix artifacts
         if: runner.os != 'Windows'
         shell: bash

diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/SamplePlugin.java b/buildSrc/src/main/java/org/springframework/shell/gradle/SamplePlugin.java
@@ -17,6 +17,7 @@
 
 import org.graalvm.buildtools.gradle.NativeImagePlugin;
 import org.graalvm.buildtools.gradle.dsl.GraalVMExtension;
+import org.graalvm.buildtools.gradle.dsl.NativeImageOptions;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaPlugin;
@@ -74,10 +75,12 @@ private void customizeNative(Project project) {
 
 	private void configureGraalVmExtension(Project project) {
 		GraalVMExtension extension = project.getExtensions().getByType(GraalVMExtension.class);
+		NativeImageOptions options = extension.getBinaries().getByName(NativeImagePlugin.NATIVE_MAIN_EXTENSION);
 		if (isEnabled(project, MUSL)) {
-			extension.getBinaries().getByName(NativeImagePlugin.NATIVE_MAIN_EXTENSION).buildArgs("--static",
-					"--libc=musl");
+			options.buildArgs("--static","--libc=musl");
 		}
+		// force compatibility as detection i.e. in macos runners is flaky
+		options.buildArgs("-march=compatibility");
 	}
 
 	private boolean isEnabled(Project project, String property) {