Add MINGWARM64 environment

Windows-on-ARM-Experiments · Sep 10, 2024 · 688453d · 688453d
1 parent d448828
commit 688453d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 13 deletions.
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
@@ -62,6 +62,10 @@ jobs:
       run: |
         $env:MSYSTEM = 'MSYS'
         msys2 ./test.sh MSYS
+    - name: 🟩 test MINGWARM64
+      run: |
+        $env:MSYSTEM = 'MINGWARM64'
+        msys2 ./test.sh MINGWARM64
     - name: 🟦 test MINGW64
       run: |
         $env:MSYSTEM = 'MINGW64'
@@ -101,6 +105,11 @@ jobs:
       run: |
         set MSYSTEM=MSYS
         msys2 ./test.sh MSYS
+    - name: 🟩 test MINGWARM64
+      shell: cmd
+      run: |
+        set MSYSTEM=MINGWARM64
+        msys2 ./test.sh MINGWARM64
     - name: 🟦 test MINGW64
       shell: cmd
       run: |
@@ -144,6 +153,10 @@ jobs:
       run: msys2 ./test.sh MSYS
       env:
         MSYSTEM: MSYS
+    - name: 🟩 test MINGWARM64
+      run: msys2 ./test.sh MINGWARM64
+      env:
+        MSYSTEM: MINGWARM64
     - name: 🟦 test MINGW64
       run: msys2 ./test.sh MINGW64
       env:
@@ -220,7 +233,7 @@ jobs:
 
 
   install:
-    name: 🟦 mingw64 | install ${{ matrix.install }}
+    name: 🟩 mingwarm64 | install ${{ matrix.install }}
     needs: [cache]
     strategy:
       fail-fast: false
@@ -239,8 +252,8 @@ jobs:
       with:
         update: true
         install: ${{ matrix.install }}
-        msystem: mingw64
-    - run: msys2 ./test.sh mingw64
+        msystem: mingwarm64
+    - run: msys2 ./test.sh mingwarm64
 
 
   defaultclean:
@@ -454,7 +467,7 @@ jobs:
     - id: min
       uses: ./matrix
       with:
-        systems: 'mingw32 mingw64 ucrt64 clang64'
+        systems: 'mingw32 mingw64 mingwarm64 ucrt64 clang64'
 
 
   msystem:

diff --git a/.github/workflows/Tool.yml b/.github/workflows/Tool.yml
@@ -21,6 +21,7 @@ jobs:
         systems: >-
           mingw32
           mingw64
+          mingwarm64
           ucrt64
           clang32
           clang64

diff --git a/action.yml b/action.yml
@@ -5,7 +5,7 @@ branding:
   icon: terminal
 inputs:
   msystem:
-    description: 'Variant of the environment to set by default: MSYS, MINGW32, MINGW64, UCRT64, CLANG32, CLANG64 or CLANGARM64'
+    description: 'Variant of the environment to set by default: MSYS, MINGW32, MINGW64, MINGWARM64, UCRT64, CLANG32, CLANG64 or CLANGARM64'
     required: false
     default: 'MINGW64'
   path-type:

diff --git a/examples/cmake.yml b/examples/cmake.yml
@@ -17,6 +17,7 @@ jobs:
         include:
           - { icon: '⬛', sys: mingw32 }
           - { icon: '🟦', sys: mingw64 }
+          - { icon: '🟩', sys: mingwarm64 }
           - { icon: '🟨', sys: ucrt64  }
           - { icon: '🟧', sys: clang64 }
     name: 🚧${{ matrix.icon }} ${{ matrix.sys }}

diff --git a/main.js b/main.js
@@ -61,7 +61,7 @@ function parseInput() {
   let p_location = core.getInput('location');
   let p_cache = core.getBooleanInput('cache');
 
-  const msystem_allowed = ['MSYS', 'MINGW32', 'MINGW64', 'UCRT64', 'CLANG32', 'CLANG64', 'CLANGARM64'];
+  const msystem_allowed = ['MSYS', 'MINGW32', 'MINGW64', 'MINGWARM64', 'UCRT64', 'CLANG32', 'CLANG64', 'CLANGARM64'];
   if (!msystem_allowed.includes(p_msystem.toUpperCase())) {
     throw new Error(`'msystem' needs to be one of ${ msystem_allowed.join(', ') }, got ${p_msystem}`);
   }

diff --git a/matrix/action.yml b/matrix/action.yml
@@ -5,7 +5,7 @@ inputs:
     description: 'Space separated list of systems to build and test the tool on.'
     required: false
     type: string
-    default: 'msys mingw32 mingw64 ucrt64 clang32 clang64'
+    default: 'msys mingw32 mingw64 mingwarm64 ucrt64 clang32 clang64'
 outputs:
   jobs:
     description: "List of MSYS2 systems to be used in the matrix of other jobs."
@@ -20,12 +20,13 @@ runs:
       run: |
         import os
         icons = {
-          'msys':    '🟪',
-          'mingw32': '⬛',
-          'mingw64': '🟦',
-          'ucrt64':  '🟨',
-          'clang32': '🟫',
-          'clang64': '🟧',
+          'msys':       '🟪',
+          'mingw32':    '⬛',
+          'mingw64':    '🟦',
+          'mingwarm64': '🟩',
+          'ucrt64':     '🟨',
+          'clang32':    '🟫',
+          'clang64':    '🟧',
         }
         jobs = [
             {'sys': sys.lower(), 'icon': icons[sys.lower()]}

diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "GitHub",
     "Actions",
     "MSYS2",
+    "MINGWARM64",
     "MINGW64",
     "MINGW32",
     "MSYS",
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ jobs: @@
             systems: >-
               mingw32
               mingw64
+              mingwarm64
               ucrt64
               clang32
               clang64
@@ Expand Down @@