Skip to content

Commit

Permalink
Merge pull request #251 from TimJentzsch/cleanup-dependencies
Browse files Browse the repository at this point in the history
Former-commit-id: fd0af4d
  • Loading branch information
janhohenheim authored Apr 9, 2023
2 parents 47e52b2 + acf6c93 commit 134e816
Show file tree
Hide file tree
Showing 7 changed files with 179 additions and 130 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

env:
CARGO_TERM_COLOR: always
NIGHTLY_TOOLCHAIN: nightly-2023-03-01
NIGHTLY_TOOLCHAIN: nightly

jobs:
test-native:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

env:
CARGO_TERM_COLOR: always
NIGHTLY_TOOLCHAIN: nightly-2023-03-01
NIGHTLY_TOOLCHAIN: nightly

jobs:
build-web:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
GAME_OSX_APP_NAME: Foxtrot

CARGO_TERM_COLOR: always
NIGHTLY_TOOLCHAIN: nightly-2023-03-01
NIGHTLY_TOOLCHAIN: nightly

permissions:
contents: write
Expand Down Expand Up @@ -43,7 +43,6 @@ jobs:
with:
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
target: aarch64-apple-darwin
override: true
- name: Install zld
run: |
brew install michaeleisel/zld/zld
Expand All @@ -55,7 +54,6 @@ jobs:
with:
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
target: x86_64-apple-darwin
override: true
- name: Build release for x86 Apple
run: |
SDKROOT=$(xcrun -sdk macosx --show-sdk-path) cargo build --release --no-default-features --features native --target=x86_64-apple-darwin
Expand Down
Loading

0 comments on commit 134e816

Please sign in to comment.