Merge pull request #492 from posit-dev/feature/runner

Use github runner for macOS builds
posit-dev · Aug 30, 2024 · d2ff5b6 · d2ff5b6
2 parents 4cbb231 + dca41c5
commit d2ff5b6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml
@@ -14,7 +14,7 @@ jobs:
     # Build ARK for macOS. Both arm64 (Apple Silicon) and x64 (Intel) hosts.
     build_macos:
         name: Build macOS
-        runs-on: [self-hosted-production, macos, arm64]
+        runs-on: macos-latest
         timeout-minutes: 40
 
         env:
@@ -41,12 +41,19 @@ jobs:
                 rustup update --no-self-update stable
                 rustup default stable
 
+            - name: Setup for x86 cross-compiling
+              if: matrix.arch == 'x64'
+              run: |
+                # Install x86 homebrew
+                arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+                # Install x86 Rust target
+                rustup target add x86_64-apple-darwin
+
             # Checkout sources
             - name: Checkout sources
               uses: actions/checkout@v4
 
-            # These are already installed for both architectures, but would be required if we switch off
-            # a self-hosted runner, so we may as well leave them in
             - name: Install zeromq dependencies
               id: install_zeromq_dependencies
               run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -82,7 +82,7 @@ jobs:
 
     create_release:
         name: Create Release
-        runs-on: [self-hosted, macos, arm64]
+        runs-on: ubuntu-latest
         needs: [do_release, get_version, build_macos, build_windows, build_linux]
         env:
             GITHUB_TOKEN: ${{ github.token }}
@@ -101,7 +101,7 @@ jobs:
     # Uploads binaries, if we created a release
     upload_release_binaries:
         name: Upload Release Binaries
-        runs-on: [self-hosted, macos, arm64]
+        runs-on: macos-latest
         needs: [create_release, get_version]
         env:
             GITHUB_TOKEN: ${{ github.token }}
@@ -189,7 +189,7 @@ jobs:
 
     status:
         if: ${{ failure() }}
-        runs-on: self-hosted
+        runs-on: ubuntu-latest
         needs: [build_macos, build_windows, get_version]
         steps:
             - name: Notify slack if build fails