Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use aarch64 macOS agent for CI build #2754

Merged
merged 3 commits into from
Apr 25, 2024
Merged

Use aarch64 macOS agent for CI build #2754

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a145a31
Use M1 macOS agent for build
paulcadman Apr 24, 2024
9799581
Use x86_64 version of vamp-ir
paulcadman Apr 24, 2024
51cd6a9
Update jaxxstorm/action-install-gh-release
paulcadman Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ jobs:
make smoke-only

build-and-test-macos:
runs-on: macos-12
runs-on: macos-14
steps:
- uses: extractions/setup-just@v2

Expand All @@ -238,6 +238,10 @@ jobs:
path: main
submodules: true

- name: install stack
run: |
brew install haskell-stack

- name: Install Sed
run: |
brew install gnu-sed
Expand Down Expand Up @@ -268,7 +272,7 @@ jobs:
echo "WASI_SYSROOT_PATH=$GITHUB_WORKSPACE/wasi-sysroot" >> $GITHUB_ENV

- name: Install the latest Wasmer version
uses: jaxxstorm/action-install-gh-release@v1.10.0
uses: jaxxstorm/action-install-gh-release@v1.11.0
with:
repo: wasmerio/wasmer
binaries-location: bin
Expand Down Expand Up @@ -310,7 +314,7 @@ jobs:
test: false
stack-arguments: --copy-bins
working-directory: smoke-repo
cache-prefix: ${{ steps.icuversion.outputs.version }}
cache-prefix: ${{ runner.arch }}-${{ steps.icuversion.outputs.version }}
pedantic: false

- name: Set homebrew LLVM CC and LIBTOOL vars (macOS)
Expand All @@ -331,7 +335,7 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ env.HOME }}/.local/bin/juvix-cairo-vm
key: ${{ runner.os }}-cairo-vm-${{ env.CAIRO_VM_VERSION }}
key: ${{ runner.os }}-${{ runner.arch }}-cairo-vm-${{ env.CAIRO_VM_VERSION }}

- name: Install Rust toolchain
if: steps.cache-cairo-vm.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -375,7 +379,7 @@ jobs:
uses: actions/cache@v3
with:
path: main/.hie
key: ${{ runner.os }}-stack-hie
key: ${{ runner.os }}-${{ runner.arch }}-stack-hie

- name: Stack setup
id: stack
Expand All @@ -384,16 +388,18 @@ jobs:
working-directory: main
stack-build-arguments: ${{ env.STACK_BUILD_ARGS }}
test: false
cache-prefix: ${{ runner.arch }}

- name: Add homebrew clang to the PATH (macOS)
run: |
echo "$(brew --prefix llvm@15)/bin" >> $GITHUB_PATH

- name: Install VampIR for testing
uses: jaxxstorm/action-install-gh-release@v1.10.0
uses: jaxxstorm/action-install-gh-release@v1.11.0
with:
repo: ${{ env.VAMPIRREPO }}
platform: darwin
arch: x86_64
tag: ${{ env.VAMPIRVERSION }}
chmod: 0755
rename-to: vamp-ir
Expand Down
Loading