Skip to content

Commit

Permalink
Update target to aarch64-apple-darwin for macOS
Browse files Browse the repository at this point in the history
Currently there seems to be a issue with the macos-12 runner image when using brew. See [issue 4020](actions/runner-images#4020) for more information.

So for now, support for the x86 architecture is on hold until
the problem is resolved or a alternative is found

macOS user's can now only use envio on the apple silicon chips.
  • Loading branch information
humblepenguinn committed Mar 23, 2024
1 parent 36ca972 commit dbf0e67
Showing 1 changed file with 30 additions and 18 deletions.
48 changes: 30 additions & 18 deletions .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ env:
on:
pull_request:
paths:
- 'src/**'
- '.github/**'
- 'Cargo.toml'
- 'Cargo.lock'
- 'build.rs'
- "src/**"
- ".github/**"
- "Cargo.toml"
- "Cargo.lock"
- "build.rs"
push:
branches:
- main
paths:
- 'src/**'
- '.github/**'
- 'Cargo.toml'
- 'Cargo.lock'
- 'build.rs'
- "src/**"
- ".github/**"
- "Cargo.toml"
- "Cargo.lock"
- "build.rs"
tags:
- "*"

Expand Down Expand Up @@ -57,12 +57,24 @@ jobs:
fail-fast: false
matrix:
job:
- { target: x86_64-unknown-linux-gnu, os: ubuntu-20.04, use-cross: true }
- { target: aarch64-unknown-linux-gnu, os: ubuntu-20.04, use-cross: true }
- { target: i686-unknown-linux-gnu, os: ubuntu-20.04, use-cross: true }
- { target: x86_64-apple-darwin, os: macos-14, }
- { target: x86_64-pc-windows-gnu, os: windows-2019, arch: x86_64 }
- { target: i686-pc-windows-msvc, os: windows-2019, arch: x86 }
- {
target: x86_64-unknown-linux-gnu,
os: ubuntu-20.04,
use-cross: true,
}
- {
target: aarch64-unknown-linux-gnu,
os: ubuntu-20.04,
use-cross: true,
}
- {
target: i686-unknown-linux-gnu,
os: ubuntu-20.04,
use-cross: true,
}
- { target: aarch64-apple-darwin, os: macos-14 }
- { target: x86_64-pc-windows-gnu, os: windows-2019, arch: x86_64 }
- { target: i686-pc-windows-msvc, os: windows-2019, arch: x86 }

env:
BUILD_CMD: cargo
Expand Down Expand Up @@ -326,7 +338,6 @@ jobs:
echo "PKG_NAME=${PKG_NAME}" >> $GITHUB_OUTPUT
echo "PKG_PATH=target/wix/${PKG_NAME}" >> $GITHUB_OUTPUT
- name: "Artifact upload: tarball"
uses: actions/upload-artifact@master
with:
Expand Down Expand Up @@ -363,4 +374,5 @@ jobs:
${{ steps.msi-installer.outputs.PKG_PATH }}
${{ steps.debian-package.outputs.DPKG_PATH }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit dbf0e67

Please sign in to comment.