Procházet zdrojové kódy

[ci] Use intel runner for x86 hl mac tests (#12471)

tobil4sk před 1 dnem
rodič
revize
98d0e89c2c

+ 5 - 4
.github/workflows/main.yml

@@ -799,7 +799,6 @@ jobs:
 
   mac-test:
     needs: mac-build-universal
-    runs-on: macos-latest
     env:
       PLATFORM: mac-universal
       HXCPP_COMPILE_CACHE: ${{ github.workspace }}/hxcache
@@ -807,15 +806,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [macro, js, cpp, jvm, php, python, lua, flash, neko]
+        target: [macro, js, hl, cpp, jvm, php, python, lua, flash, neko]
+        arch: [arm64]
         include:
         - target: hl
           arch: arm64
           runci-args: --skip-hl-jit
         - target: hl
           arch: x86_64
-          haxe-invoke: arch -x86_64
+          runner: macos-15-intel
 
+    runs-on: ${{ matrix.runner || 'macos-latest' }}
     steps:
       - uses: actions/checkout@main
         with:
@@ -870,7 +871,7 @@ jobs:
         run: |
           # disable invalid Unicode filenames on APFS
           echo "" > sys/compile-fs.hxml
-          ${{ matrix.haxe-invoke }} haxe -D include_legacy --run RunCi ${{ matrix.target }} ${{ matrix.runci-args }}
+          haxe -D include_legacy --run RunCi ${{ matrix.target }} ${{ matrix.runci-args }}
         working-directory: ${{github.workspace}}/tests
         timeout-minutes: 60
 

+ 1 - 1
extra/github-actions/test-mac.yml

@@ -24,6 +24,6 @@
   run: |
     # disable invalid Unicode filenames on APFS
     echo "" > sys/compile-fs.hxml
-    ${{ matrix.haxe-invoke }} haxe -D include_legacy --run RunCi ${{ matrix.target }} ${{ matrix.runci-args }}
+    haxe -D include_legacy --run RunCi ${{ matrix.target }} ${{ matrix.runci-args }}
   working-directory: ${{github.workspace}}/tests
   timeout-minutes: 60

+ 4 - 3
extra/github-actions/workflows/main.yml

@@ -452,7 +452,6 @@ jobs:
 
   mac-test:
     needs: mac-build-universal
-    runs-on: macos-latest
     env:
       PLATFORM: mac-universal
       HXCPP_COMPILE_CACHE: ${{ github.workspace }}/hxcache
@@ -460,15 +459,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [macro, js, cpp, jvm, php, python, lua, flash, neko]
+        target: [macro, js, hl, cpp, jvm, php, python, lua, flash, neko]
+        arch: [arm64]
         include:
         - target: hl
           arch: arm64
           runci-args: --skip-hl-jit
         - target: hl
           arch: x86_64
-          haxe-invoke: arch -x86_64
+          runner: macos-15-intel
 
+    runs-on: ${{ matrix.runner || 'macos-latest' }}
     steps:
       - uses: actions/checkout@main
         with: