Skip to content

Commit

Permalink
Remove nix and add mac and windows to CI
Browse files Browse the repository at this point in the history
  • Loading branch information
TheButlah committed Nov 9, 2023
1 parent 140e93d commit a57bcf3
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 202 deletions.
23 changes: 11 additions & 12 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,27 @@ jobs:

check:
name: Build and Test
runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest-arm64]
runs-on: ${{ matrix.os }}
steps:
- name: Install dependencies
if: ${{ startsWith(matrix.os, 'ubuntu') }}
run: |
sudo apt-get -y install \
libasound2-dev \
libudev-dev \
libx11-dev
- uses: actions/checkout@v3
- name: Install nix
uses: cachix/install-nix-action@v22
- name: Set up nix cache
uses: cachix/cachix-action@v12
continue-on-error: true
with:
name: nexus-ci
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
- name: Cache cargo dependencies
uses: Swatinem/rust-cache@v2
- name: Clippy lints
run: |
nix develop -ic \
cargo clippy --all --all-features --all-targets --no-deps -- -Dwarnings
- name: Cargo Doc
run: |
nix develop -ic \
cargo doc --all --all-features --no-deps --document-private-items
- name: Cargo Test
run: |
nix develop -ic \
cargo test --all --all-features --all-targets
10 changes: 0 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,6 @@ the skills/demos that interest you for instructions on how to run them.
- Install [bevy's dependencies](https://bevyengine.org/learn/book/getting-started/setup/#install-os-dependencies)
- Install [git lfs](https://git-lfs.com/) and run `git lfs install && git lfs pull`

### Option 2 (Linux and Mac only!): Nix package manager

- Have the [nix](https://nixos.org/download) package manager installed
- [Enable flakes](https://nixos.wiki/wiki/Flakes#Permanent)
- `nix profile install nixpkgs#direnv`
- [hook direnv into your shell](https://direnv.net/docs/hook.html)
- `cp .envrc.example .envrc` - feel free to customize this
- `direnv allow`
- `git lfs install && git lfs pull`

## Contributions

See [CONTRIBUTING.md](CONTRIBUTING.md).
Expand Down
100 changes: 0 additions & 100 deletions flake.lock

This file was deleted.

79 changes: 0 additions & 79 deletions flake.nix

This file was deleted.

2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
channel = "1.73.0" # See workspace Cargo.toml
components = ["rust-src", "rust-analyzer"]
profile = "default"
targets = ["x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc", "aarch64-apple-darwin", "aarch64-linux-android"]
targets = ["x86_64-pc-windows-msvc", "aarch64-apple-darwin", "aarch64-linux-android"]

0 comments on commit a57bcf3

Please sign in to comment.