Skip to content

Commit

Permalink
cargo update, fix linux-cross matrix.target.args
Browse files Browse the repository at this point in the history
  • Loading branch information
ijl committed Mar 28, 2023
1 parent 47cb520 commit 5ae4b76
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux-cross.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ jobs:
with:
maturin-version: v1.0.0-beta.5
target: ${{ matrix.target.arch }}
rust-toolchain: nightly-2023-03-20
rust-toolchain: nightly-2023-03-28
rustup-components: rust-src
manylinux: auto
args: --release --strip --out dist -i python${{ matrix.python.version }}
args: --release --strip --out dist -i python${{ matrix.python.version }} ${{ matrix.target.args }}
- uses: uraimo/run-on-arch-action@v2
name: Install built wheel
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manylinux2014.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
image: quay.io/pypa/manylinux2014_x86_64:latest
options: --user 0
steps:
- run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-03-20 --profile minimal -y
- run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-03-28 --profile minimal -y
- uses: actions/checkout@v3
- run: python3 -m pip install --user --upgrade --pre pip "maturin>=0.14,<2" wheel
- run: maturin build --release --strip --features=unstable-simd,yyjson --compatibility manylinux2014 --interpreter python${{ matrix.python.version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manylinux_2_28.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:
options: --user 0
steps:
- run: yum install -y clang lld
- run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-03-20 --profile minimal -y
- run: rustup component add rust-src --toolchain nightly-2023-03-20-x86_64-unknown-linux-gnu
- run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-03-28 --profile minimal -y
- run: rustup component add rust-src --toolchain nightly-2023-03-28-x86_64-unknown-linux-gnu
- uses: actions/checkout@v3
- run: python3 -m pip install --user --upgrade --pre pip "maturin>=0.14,<2" wheel
- run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/musllinux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
CARGO_UNSTABLE_SPARSE_REGISTRY: "true"
with:
maturin-version: v1.0.0-beta.5
rust-toolchain: nightly-2023-03-20
rust-toolchain: nightly-2023-03-28
rustup-components: rust-src
target: ${{ matrix.platform.target }}
manylinux: musllinux_1_1
Expand Down
20 changes: 9 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
*.patch
/.benchmarks
/.coverage
/.mypy_cache
/.pytest_cache
/.venv*
/build
/include/vendor
/perf.*
__pycache__
*.pyc
/target
.pytest_cache
/.venv*
benchmark_*.svg
.coverage
.benchmarks
.mypy_cache
vendor
build
!json/perfect_float.patch
/vendor
__pycache__
16 changes: 8 additions & 8 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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,7 @@ It benefits from also having a C build environment to compile a faster
deserialization backend. See this project's `manylinux_2_28` builds for an
example using clang and LTO.

The project's own CI tests against `nightly-2023-03-20` and stable 1.60. It
The project's own CI tests against `nightly-2023-03-28` and stable 1.60. It
is prudent to pin the nightly version because that channel can introduce
breaking changes.

Expand Down
2 changes: 1 addition & 1 deletion ci/azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
toolchain: nightly-2023-03-20
toolchain: nightly-2023-03-28

jobs:

Expand Down

0 comments on commit 5ae4b76

Please sign in to comment.