Update workflows again

Author: pdarragh

.github/workflows/macos.yml

@@ -1,27 +1,20 @@
-name: Build and test macOS x86_64
-on:
-  push:
-  workflow_dispatch:
+name: macOS
+on: [push, workflow_dispatch]
 
 concurrency:
-  group: mac-ci-${{ github.ref }}
+  group: macos-ci-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   build-and-test:
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         os: [macos-14, macos-15, macos-15-intel, macos-26]
         racket-variant: ['CS']
         racket-version: ['stable']
-        include:
-          - os: macos-13
-            arch: x64
-          - os: macos-14
-            arch: arm64
     runs-on: ${{ matrix.os }}
-    name: Test on ${{ matrix.os }} (${{ matrix.arch }}) Racket ${{ matrix.racket-variant }} ${{ matrix.racket-version }}
+    name: OS ${{ matrix.os }} / Racket ${{ matrix.racket-version }}
 
     steps:
 
@@ -52,7 +45,9 @@ jobs:
         gcc --version
 
     - name: Install langs package
-      run: raco pkg install --auto ../langs/
+      run: |
+        raco pkg install --auto ../langs/
 
     - name: Run tests
-      run: raco test -p langs
+      run: |
+        raco test -p langs

.github/workflows/push.yml .github/workflows/ubuntu.yml.github/workflows/push.yml renamed to .github/workflows/ubuntu.yml

@@ -1,35 +1,55 @@
-on:
-  - push
+name: Ubuntu
+on: [push, workflow_dispatch]
+
+concurrency:
+  group: ubuntu-ci-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build-and-test:
-    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: true
       matrix:
         os: [ubuntu-22.04, ubuntu-24.04]
         racket-variant: ['CS']
         racket-version: ['8.6', '8.10', '8.14', '8.18', 'stable', 'current']
-    name: Test on Racket ${{ matrix.racket-variant }} ${{ matrix.racket-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    name: OS ${{ matrix.os }} / Racket ${{ matrix.racket-version }}
+
     steps:
+
     - name: Checkout
       uses: actions/checkout@main
+
     - name: Install Racket
       uses: Bogdanp/setup-racket@v1.14
       with:
         architecture: 'x64'
         distribution: 'full'
         variant: ${{ matrix.racket-variant }}
         version: ${{ matrix.racket-version }}
+
+    - name: Cache Racket packages
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.racket
+          ~/.cache/racket
+        key: racket-${{ matrix.racket-variant }}-${{ matrix.racket-version }}-${{ matrix.os }}
+
     - name: Install clang
       run: |
         sudo apt install -y clang libssl-dev
+
     - name: Version info
       run: |
         clang --version
         gcc --version
+
     - name: Install langs package
       run: |
         raco pkg install --auto ../langs/
+
     - name: Run tests
       run: |
         xvfb-run raco test -p langs