Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
louisfd committed Nov 21, 2023
2 parents 1effdf6 + cdf54d0 commit 622d1f8
Show file tree
Hide file tree
Showing 42 changed files with 781 additions and 118 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

### Checklist

- [ ] Confirm that `run-checks` script has been executed.
- [ ] Confirmed that `run-checks all` script has been executed.
- [ ] Made sure the book is up to date with changes in this PR.

### Related Issues/PRs

Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: dependencies

on:
push:
branches:
- main
paths:
- '**/Cargo.lock'
- '**/Cargo.toml'
pull_request:
types: [opened, synchronize]
paths:
- '**/Cargo.lock'
- '**/Cargo.toml'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
dependencies:
runs-on: ubuntu-latest

steps:

- name: checkout
uses: actions/checkout@v4

- name: Audit Rust dependencies
uses: actions-rust-lang/audit@v1

- name: Detect multiple versions of the same crate
uses: EmbarkStudios/cargo-deny-action@v1
with:
command: check bans licenses sources

- name: Install Rust nightly
uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly
components: rustfmt

# - name: Install cargo-udeps
# env:
# UDEPS_LINK: https://github.com/est31/cargo-udeps/releases/download
# UDEPS_VERSION: v0.1.43
# run: |
# curl -L "$UDEPS_LINK/$UDEPS_VERSION/cargo-udeps-$UDEPS_VERSION-x86_64-unknown-linux-gnu.tar.gz" |
# tar xz -C $HOME/.cargo/bin --strip-components 2

# - name: Run cargo-udeps
# run: |
# cargo +nightly udeps --all-targets
7 changes: 5 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ concurrency:

jobs:
tests:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
rust: [stable, 1.71.0]
Expand Down Expand Up @@ -89,7 +89,10 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
# Run clippy for each workspace, targets, and featrues, considering
# warnings as errors
clippy_flags: --workspace --all-targets --all-features -- -D warnings
clippy_flags: --all-targets -- -Dwarnings
# Do not filter results
filter_mode: nofilter
# Report clippy annotations as snippets
reporter: github-pr-check

- name: Install grcov
Expand Down
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[workspace]
# Try
# require version 2 to avoid "feature" additiveness for dev-dependencies
# https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2
resolver = "2"
Expand Down Expand Up @@ -75,7 +76,7 @@ wasm-logger = "0.2.0"
futures-intrusive = "0.5"
pollster = "0.3"
text_placeholder = { version = "0.5.0", features = ["struct_context"] }
wgpu = "0.17.1"
wgpu = "0.18.0"

#
# The following packages disable the "std" feature for no_std compatibility
Expand Down
Loading

0 comments on commit 622d1f8

Please sign in to comment.