Use macos-15-intel and architecture: default to simplify CI

Author: topolarity

.github/workflows/system.yml

@@ -15,45 +15,31 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
+          - macos-15-intel
+          - macos-latest
           - windows-latest
-        architecture: [x64]
+        architecture: [default]
         python-version: ['3.x']
         julia-version:
           - '1'
           - 'nightly'
         include:
-          - os: macos-latest
-            architecture: arm64
-            python-version: '3.x'
-            julia-version: '1'
-          - os: macos-latest
-            architecture: arm64
-            python-version: '3.x'
-            julia-version: 'nightly'
-          - os: macos-latest
-            architecture: x64 # agent is arm64 (runs under Rosetta)
-            python-version: '3.x'
-            julia-version: '1'
-          - os: macos-latest
-            architecture: x64 # agent is arm64 (runs under Rosetta)
-            python-version: '3.x'
-            julia-version: 'nightly'
           # 32 bit Windows:
           - os: windows-latest
             architecture: x86
             python-version: '3.x'
             julia-version: '1'
           # Sweep python-version and julia-version only on Ubuntu:
           - os: ubuntu-latest
-            architecture: x64
+            architecture: default
             python-version: '3.10'
             julia-version: '1'
           - os: ubuntu-latest
-            architecture: x64
+            architecture: default
             python-version: '3.x'
             julia-version: '1.5'
           - os: ubuntu-latest
-            architecture: x64
+            architecture: default
             python-version: '3.x'
             julia-version: '1.4'
       fail-fast: false
@@ -64,24 +50,29 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Setup python
+        if: matrix.architecture == 'default'
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Setup python
+        if: matrix.architecture != 'default'
         uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.architecture }}
       - name: Install numpy
         run: python -m pip install --user numpy
-        if: ${{ !(matrix.os == 'macos-latest' && matrix.architecture == 'x64') }}
-      - name: Install numpy (Rosetta)
-        run: arch -x86_64 python -m pip install --user numpy
-        if: ${{ matrix.os == 'macos-latest' && matrix.architecture == 'x64' }}
       - name: Install virtualenv
         run: python -m pip install virtualenv
-        if: ${{ !(matrix.os == 'macos-latest' && matrix.architecture == 'x64') }}
-      - name: Install virtualenv (Rosetta)
-        run: arch -x86_64 python -m pip install virtualenv
-        if: ${{ matrix.os == 'macos-latest' && matrix.architecture == 'x64' }}
       - run: virtualenv --version
       - name: Setup julia
+        if: matrix.architecture == 'default'
+        uses: julia-actions/setup-julia@v1
+        with:
+          version: ${{ matrix.julia-version }}
+          show-versioninfo: true
+      - name: Setup julia
+        if: matrix.architecture != 'default'
         uses: julia-actions/setup-julia@v1
         with:
           version: ${{ matrix.julia-version }}