feat: fix macos

This commit is contained in:
Kasper Juul Hermansen 2023-03-18 16:23:00 +01:00
parent 1e10149522
commit 59b42fc273
Signed by: kjuulh
GPG Key ID: 57B6E1465221F912
2 changed files with 36 additions and 26 deletions

View File

@ -75,35 +75,42 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2.0.0
#- name: Install packages (Ubuntu) #- name: Install packages (Ubuntu)
# if: matrix.os == 'ubuntu-22.04' # if: matrix.os == 'ubuntu-22.04'
# run: | # run: |
# ci/ubuntu-install-packages # ci/ubuntu-install-packages
#- name: Install packages (macOS) - name: Install packages (macOS)
# if: matrix.os == 'macos-12' if: matrix.os == 'macos-12'
# run: | run: |
# ci/macos-install-packages ci/scripts/macos-install-packages
- name: Install Rust - name: Set up QEMU
uses: dtolnay/rust-toolchain@master uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2.0.0
- uses: actions-rs/toolchain@v1
if: matrix.target == ""
with: with:
toolchain: ${{ matrix.rust }} toolchain: ${{ matrix.rust }}
- name: Use Cross - uses: actions-rs/toolchain@v1
if: matrix.target != '' if: matrix.target != ""
run: | with:
cargo install cross toolchain: ${{ matrix.rust }}
echo "CARGO=cross" >> $GITHUB_ENV use-cross: true
echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV - uses: actions-rs/cargo@v1
echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV if: matrix.target != ""
- name: Show command used for Cargo with:
run: | use-cross: true
echo "cargo command is: ${{ env.CARGO }}" command: build --workspace --verbose
echo "target flag is: ${{ env.TARGET_FLAGS }}" - uses: actions-rs/cargo@v1
- name: Build all crates if: matrix.target == ""
run: ${{ env.CARGO }} build --verbose --workspace ${{ env.TARGET_FLAGS }} with:
- name: Run tests command: build --workspace --verbose
if: matrix.target == '' - uses: actions-rs/cargo@v1
run: ${{ env.CARGO }} test --verbose --workspace ${{ env.TARGET_FLAGS }} if: matrix.target != ""
with:
use-cross: true
command: test --all --verbose
- uses: actions-rs/cargo@v1
if: matrix.target == ""
with:
command: test --all --verbose

View File

@ -0,0 +1,3 @@
#!/bin/sh
brew install docker