ci: make use of makima-chan

tweag · Nov 16, 2024 · 6ee85d3 · 6ee85d3
1 parent 56d0c89
commit 6ee85d3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 24 deletions.
diff --git a/.github/workflows/aarch64-linux-bindist.yml b/.github/workflows/aarch64-linux-bindist.yml
@@ -12,18 +12,15 @@ on:
 jobs:
   ghc-wasm-aarch64-linux-bindist:
     name: ghc-wasm-aarch64-linux-bindist
-    runs-on:
-      - self-hosted
-      - Linux
-      - ARM64
+    runs-on: makima
     steps:
 
       - name: checkout
         uses: actions/checkout@v4
 
       - name: build & test
         run: |
-          podman run \
+          docker run \
             --rm \
             --init \
             --network host \

diff --git a/.github/workflows/darwin-bindist.yml b/.github/workflows/darwin-bindist.yml
@@ -9,36 +9,30 @@ on:
     - cron: '0 6 * * 0'
 
 jobs:
-  ghc-wasm-darwin-bindist:
-    name: ghc-wasm-${{ matrix.arch }}-darwin-bindist
-    runs-on: ${{ matrix.os }}
+  ghc-wasm-aarch64-darwin-bindist:
+    name: ghc-wasm-aarch64-darwin-${{ matrix.branch }}-bindist
+    runs-on: makima
     strategy:
       matrix:
         include:
-          - arch: aarch64
-            os: macos-15
-          - arch: x86_64
-            os: macos-15-large
+          - branch: master
+            remote: https://gitlab.haskell.org/ghc/ghc.git
+          - branch: ghc-9.12
+            remote: https://gitlab.haskell.org/TerrorJack/ghc.git
+          - branch: ghc-9.10
+            remote: https://gitlab.haskell.org/TerrorJack/ghc.git
     env:
       MACOSX_DEPLOYMENT_TARGET: "13.0"
     steps:
 
-      - name: setup-xcode
-        run: |
-          sudo xcode-select --switch /Applications/Xcode_16.1.app
-
-      - name: setup-brew-deps
-        run: |
-          brew install automake
-
       - name: setup-haskell
         uses: haskell-actions/setup@v2
 
       - name: setup-cabal-deps
         run: |
           cabal install \
             alex-3.5.1.0 \
-            happy-2.0.2
+            happy-1.20.1.1
 
       - name: setup-ghc-wasm-meta
         run: |
@@ -48,7 +42,7 @@ jobs:
       - name: build-hadrian
         working-directory: ${{ runner.temp }}
         run: |
-          git clone --ref-format=reftable --depth=1 --recurse-submodules --shallow-submodules --jobs 32 https://gitlab.haskell.org/ghc/ghc.git
+          git clone --branch=${{ matrix.branch }} --depth=1 --recurse-submodules --shallow-submodules --jobs 32 ${{ matrix.remote }}
           cd ghc
           ./hadrian/build --version
 
@@ -67,12 +61,12 @@ jobs:
         working-directory: ${{ runner.temp }}/ghc
         run: |
           BINDIST_NAME=$(basename _build/bindist/*)
-          gtar --sort=name --mtime="@$(git log -1 --pretty=%ct)" --owner=0 --group=0 --numeric-owner --use-compress-program="zstd --ultra -22 --threads=0" -cf _build/bindist/$BINDIST_NAME.tar.zst -C _build/bindist $BINDIST_NAME
+          tar --use-compress-program="zstd --ultra -22 --threads=0" -cf _build/bindist/$BINDIST_NAME.tar.zst -C _build/bindist $BINDIST_NAME
 
       - name: upload-bindist
         uses: actions/upload-artifact@v4
         with:
-          name: ghc-wasm-${{ matrix.arch }}-darwin-bindist
+          name: ghc-wasm-aarch64-darwin-${{ matrix.branch }}-bindist
           path: ${{ runner.temp }}/ghc/_build/bindist/*.tar.zst
 
       - name: test-ghc

diff --git a/alpine-build.sh b/alpine-build.sh
@@ -14,6 +14,7 @@ apk add \
   coreutils \
   ghc \
   jq \
+  musl-locales \
   ncurses-static \
   python3 \
   xz \