ci: update github actions

JuliaSIMD · Jan 2, 2025 · 2dc946e · 2dc946e
1 parent 6d42394
commit 2dc946e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 48 deletions.
diff --git a/.github/workflows/ci-julia-nightly.yml b/.github/workflows/ci-julia-nightly.yml
@@ -2,67 +2,52 @@ name: CI (Julia nightly)
 on:
   pull_request:
     branches:
-      - master
+      - main
     paths-ignore:
       - 'LICENSE.md'
       - 'README.md'
       - '.github/workflows/TagBot.yml'
   push:
     tags: '*'
     branches:
-      - master
+      - main
     paths-ignore:
       - 'LICENSE.md'
       - 'README.md'
       - '.github/workflows/TagBot.yml'
 jobs:
   test-julia-nightly:
     timeout-minutes: 30
-    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ github.event_name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        arch:
-          - x64
-          - x86
+        # use default arch
         exclusive:
           - '0'
         os:
           - ubuntu-latest
-          - macOS-latest
+          - macOS-latest  # arm
           - windows-latest
         threads:
           - '5'
         version:
-          - '1.5'
-          - '1'
+          # Runs on Julia nightly only.
           - 'nightly'
-        exclude:
-          - os: macOS-latest
-            arch: x86 # 32-bit Julia binaries are not available on macOS
         include:
-          - exclusive: '1'
-            threads: '2'
-            arch: x64
+          # (exclusive=1, threads=2)
+          - arch: x64
+            exclusive: '1'
             os: ubuntu-latest
-            version: '1'
+            threads: '2'
+            version: '1.11'
     steps:
       - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
-          arch: ${{ matrix.arch }}
-      - uses: actions/cache@v4
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
-            ${{ runner.os }}-
+      - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
         env:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,15 +2,15 @@ name: CI
 on:
   pull_request:
     branches:
-      - master
+      - main
     paths-ignore:
       - 'LICENSE.md'
       - 'README.md'
       - '.github/workflows/TagBot.yml'
   push:
     tags: '*'
     branches:
-      - master
+      - main
     paths-ignore:
       - 'LICENSE.md'
       - 'README.md'
@@ -30,39 +30,35 @@ jobs:
           - '0'
         os:
           - ubuntu-latest
-          - macOS-latest
           - windows-latest
+          - macos-13  # Intel
         threads:
           - '5'
         version:
-          - '1.5'
-          - '1'
-          - 'nightly'
+          - '1.11'
+          # - '1'  # Use this when julia +1 > 1.11
         exclude:
-          - os: macOS-latest
+          - os: macos-13
             arch: x86 # 32-bit Julia binaries are not available on macOS
         include:
-          - exclusive: '1'
-            threads: '2'
-            arch: x64
+          - arch: aarch64
+            exclusive: '0'
+            os: macOS-latest  # Arm
+            threads: '5'
+            version: '1.11'
+          # (exclusive=1, threads=2)
+          - arch: x64
+            exclusive: '1'
             os: ubuntu-latest
-            version: '1'
+            threads: '2'
+            version: '1.11'
     steps:
       - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v4
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
-            ${{ runner.os }}-
+      - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
         env: