Skip to content

Commit

Permalink
GHA: fix macos x86_64 build
Browse files Browse the repository at this point in the history
Need to run it on arm64.

[ci skip]
  • Loading branch information
gaborcsardi committed Dec 9, 2024
1 parent 67a718c commit a589dd4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ jobs:
# -----------------------------------------------------------------------
macos:
runs-on: macos-12
runs-on: macos-latest
if: ${{ github.event.inputs.macos == '' || github.event.inputs.macos == 'yes' }}
name: macOS x86_64
env:
# RVERSIONS: "3.5 3.6 4.0 4.1 4.2 4.3-x86_64 4.4-x86_64 4.5-x86_64"
RVERSION_DEFAULT: "4.3-x86_64"
RVERSIONS: "3.5 3.6 4.0 4.1 4.2 4.3-x86_64 4.4-x86_64 4.5-x86_64"
RVERSION_DEFAULT: "4.4-x86_64"
steps:

- name: Checkout
Expand All @@ -109,14 +109,14 @@ jobs:
- name: Install R
run: |
sudo rig add 3.5
sudo rig add 3.6
sudo rig add 4.0
sudo rig add 4.1
sudo rig add 4.2
sudo rig add 4.3
sudo rig add release
sudo rig add devel
sudo rig add 3.5 --arch x86_64
sudo rig add 3.6 --arch x86_64
sudo rig add 4.0 --arch x86_64
sudo rig add 4.1 --arch x86_64
sudo rig add 4.2 --arch x86_64
sudo rig add 4.3 --arch x86_64
sudo rig add release --arch x86_64
sudo rig add devel --arch x86_64
rig default release
- name: Install skopeo
Expand Down
2 changes: 1 addition & 1 deletion tools/build/linux/Dockerfile-cross-aarch64
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ghcr.io/r-lib/pak-cross-aarch64:latest

# Build a cross-compiler from x86_64 (or whatever platform this
# Dockerfile) is built on, to aarch64. This uses the Alpine Linux
# Dockerfile is built on), to aarch64. This uses the Alpine Linux
# cross compiler toolchain, which is not for general use, but works
# pretty well. We build a coupele of APK packages, for binutils, gcc,
# g++, gnat, and also some packages for aarch64 that match these compilers:
Expand Down

0 comments on commit a589dd4

Please sign in to comment.