Drop community-m1 as it's no longer

lamdera · Sep 19, 2024 · 75cce06 · 75cce06
1 parent caed3a2
commit 75cce06
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build-linux-arm64.yml b/.github/workflows/build-linux-arm64.yml
@@ -9,7 +9,6 @@ name: Build Linux arm64
 jobs:
   build:
     name: Build Linux arm64
-    # For some reason this OOM's on community m1 but not on local m1, so we use a dedicated linux-arm64 box for now
     runs-on: lamdera-community-linux-arm64
     steps:
       - name: Install SSH key

diff --git a/.github/workflows/build-macos-arm64.yml b/.github/workflows/build-macos-arm64.yml
@@ -9,7 +9,7 @@ name: Build MacOS arm64
 jobs:
   build:
     name: Build MacOS arm64
-    runs-on: lamdera-community-m1
+    runs-on: macos-latest
     steps:
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2
@@ -22,6 +22,7 @@ jobs:
       - run: echo "${HOME}/.local/bin" >> $GITHUB_PATH
       - name: Run distribution script
         run: |
-          test -x "$(which ghcup)" && curl https://downloads.haskell.org/~ghcup/aarch64-apple-darwin-ghcup -o ~/.local/bin/ghcup && chmod a+x ~/.local/bin/ghcup
+          mkdir -p ~/.local/bin
+          curl https://downloads.haskell.org/~ghcup/aarch64-apple-darwin-ghcup -o ~/.local/bin/ghcup && chmod a+x ~/.local/bin/ghcup
           cd distribution
           ./build-macos-arm64.sh
diff --git a/.github/workflows/build-macos-x86_64.yml b/.github/workflows/build-macos-x86_64.yml
@@ -9,7 +9,7 @@ name: Build MacOS x86_64
 jobs:
   build:
     name: Build MacOS x86_64
-    runs-on: lamdera-community-m1
+    runs-on: macos-13
     steps:
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2
@@ -22,6 +22,7 @@ jobs:
       - run: echo "${HOME}/.local/bin" >> $GITHUB_PATH
       - name: Run distribution script
         run: |
-          test -x "$(which ghcup)" && curl https://downloads.haskell.org/~ghcup/aarch64-apple-darwin-ghcup -o ~/.local/bin/ghcup && chmod a+x ~/.local/bin/ghcup
+          mkdir -p ~/.local/bin
+          curl https://downloads.haskell.org/~ghcup/x86_64-apple-darwin-ghcup -o ~/.local/bin/ghcup && chmod a+x ~/.local/bin/ghcup
           cd distribution
           ./build-macos-x86_64.sh