Skip to content

Commit

Permalink
Merge branch 'main' into barzamin/wgpu-0.17
Browse files Browse the repository at this point in the history
  • Loading branch information
parasyte committed Oct 30, 2023
2 parents 306bd40 + b387ee2 commit 24a617a
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 41 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
rust:
- stable
- beta
- 1.65.0
- 1.70.0
steps:
- name: Checkout sources
uses: actions/checkout@v3
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
rust:
- stable
- beta
- 1.65.0
- 1.70.0
steps:
- name: Checkout sources
uses: actions/checkout@v3
Expand Down
97 changes: 59 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion MSRV.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| `pixels` version | `rustc` version |
|------------------|-----------------|
| (unreleased) | `1.65.0` |
| (unreleased) | `1.70.0` |
| `0.13.0` | `1.65.0` |
| `0.12.1` | `1.65.0` |
| `0.12.0` | `1.65.0` |
Expand Down

0 comments on commit 24a617a

Please sign in to comment.