Skip to content

Commit

Permalink
Revert "Try again before resorting to building std"
Browse files Browse the repository at this point in the history
This reverts commit 7fe6faf.
  • Loading branch information
Fernthedev committed Dec 28, 2023
1 parent 7fe6faf commit 8833d41
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/cargo-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ jobs:
- uses: actions/checkout@v2

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
- uses: actions/cache@v3
with:
path: |
Expand Down Expand Up @@ -65,14 +67,15 @@ jobs:
- uses: actions-rs/toolchain@v1
if: ${{matrix.os == 'macos-latest' }}
with:
toolchain: nightly
target: aarch64-apple-darwin

- name: Cargo build for aarch64 Mac
if: ${{matrix.os == 'macos-latest' }}
uses: actions-rs/cargo@v1
with:
command: build
args: --release --target aarch64-apple-darwin # -Zbuild-std
args: --release --target aarch64-apple-darwin

- name: Install Inno Setup
if: ${{matrix.os == 'macos-latest' }}
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/cargo-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
- uses: actions/checkout@v2

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
- uses: actions/cache@v3
with:
path: |
Expand Down Expand Up @@ -70,14 +72,15 @@ jobs:
- uses: actions-rs/toolchain@v1
if: ${{matrix.os == 'macos-latest' }}
with:
toolchain: nightly
target: aarch64-apple-darwin

- name: Cargo build for aarch64 Mac
if: ${{matrix.os == 'macos-latest' }}
uses: actions-rs/cargo@v1
with:
command: build
args: --release --target aarch64-apple-darwin -Zbuild-std
args: --release --target aarch64-apple-darwin

- name: Install Inno Setup
if: ${{matrix.os == 'macos-latest' }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:
- uses: actions/checkout@v2

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
- uses: actions/cache@v3
with:
path: |
Expand Down

0 comments on commit 8833d41

Please sign in to comment.