Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
glandium committed Sep 30, 2024
2 parents d79779e + 05dfb54 commit 4028262
Show file tree
Hide file tree
Showing 31 changed files with 3,500 additions and 1,733 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cargo-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
toolchain: [1.80.0]
toolchain: [1.81.0]
include:
- os: windows-latest
toolchain: 1.80.0-x86_64-pc-windows-gnu
toolchain: 1.81.0-x86_64-pc-windows-gnu
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ on:
- '**.py'
- '.github/workflows/python.yml'
jobs:
flake8:
ruff:
strategy:
fail-fast: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: chartboost/ruff-action@v1
with:
python-version: '3.9'
- name: flake8
run: |
pip install flake8==4.0.1
flake8 --ignore E402,F405,W504,E741
version: 0.6.5
- uses: chartboost/ruff-action@v1
with:
version: 0.6.5
args: 'format --diff'
10 changes: 5 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
toolchain: [1.80.0]
toolchain: [1.81.0]
include:
- os: windows-latest
toolchain: 1.80.0-x86_64-pc-windows-gnu
toolchain: 1.81.0-x86_64-pc-windows-gnu
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.80.0
toolchain: 1.81.0
components: rustfmt
- run: cargo fmt -- --check

Expand All @@ -68,10 +68,10 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
toolchain: [1.80.0, 1.74.0]
toolchain: [1.81.0, 1.74.0]
include:
- os: windows-latest
toolchain: 1.80.0-x86_64-pc-windows-gnu
toolchain: 1.81.0-x86_64-pc-windows-gnu
- os: windows-latest
toolchain: 1.74.0-x86_64-pc-windows-gnu
runs-on: ${{ matrix.os }}
Expand Down
Loading

0 comments on commit 4028262

Please sign in to comment.