Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ updates:
directory: "/"
schedule:
interval: "weekly"
ignore:
# `dtolnay/rust-toolchain@1.98.0` is not an action version: the tag names the Rust
# toolchain the job installs (the workspace's, kept in step with the MSRV job's own
# pin). A bump to `@1.120.0` asks for a toolchain that does not exist and fails every
# job; the toolchain moves by hand, with the code that needs it.
- dependency-name: "dtolnay/rust-toolchain"
groups:
github-actions:
patterns:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
name: cargo audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: taiki-e/install-action@v2
with:
tool: cargo-audit
Expand All @@ -57,7 +57,7 @@ jobs:
name: cargo deny
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: taiki-e/install-action@v2
with:
tool: cargo-deny
Expand Down
52 changes: 26 additions & 26 deletions .github/workflows/bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
- uses: Swatinem/rust-cache@v2
- run: cargo test --release --locked -p inkvec -p inkvec-ffi
- name: Record this target's contract hashes
if: always()
shell: bash
run: INKVEC_BLESS=add cargo test --release --locked -p inkvec --test contract
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: always()
with:
name: contract-${{ matrix.os }}
Expand All @@ -72,8 +72,8 @@ jobs:
name: generated files
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@v7
- uses: actions/setup-python@v7
with:
python-version: "3.11"
- run: python bindings/codegen/generate.py --check
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
- { name: macos-arm64, os: macos-14, target: aarch64-apple-darwin, glibc: "" }
- { name: macos-x64, os: macos-15-intel, target: x86_64-apple-darwin, glibc: "" }
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
with:
targets: ${{ matrix.target }}
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
Copy-Item "$lib/inkvec_ffi.dll" .
"INKVEC_C_EXAMPLE=$PWD\trace-c.exe" | Out-File -Append -Encoding utf8 $env:GITHUB_ENV

- uses: actions/setup-python@v5
- uses: actions/setup-python@v7
with:
python-version: "3.11"
- name: The C ABI through ctypes, and the C example, against the contract
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
run: |
New-Item -ItemType Directory -Force -Path dist | Out-Null
Compress-Archive -Path "stage/$env:ARCHIVE_NAME" -DestinationPath "dist/$env:ARCHIVE_NAME.zip" -Force
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: c-${{ matrix.name }}
path: dist/*
Expand All @@ -247,8 +247,8 @@ jobs:
- { name: macos-arm64, os: macos-14, target: aarch64-apple-darwin }
- { name: macos-x64, os: macos-15-intel, target: x86_64-apple-darwin }
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@v7
- uses: actions/setup-python@v7
with:
python-version: "3.11"
- uses: PyO3/maturin-action@v1
Expand All @@ -262,7 +262,7 @@ jobs:
run: |
pip install dist/*.whl pytest pillow numpy
python -m pytest -q crates/inkvec-py/tests
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: wheel-${{ matrix.name }}
path: dist/*.whl
Expand All @@ -272,12 +272,12 @@ jobs:
name: sdist
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: PyO3/maturin-action@v1
with:
command: sdist
args: --out dist -m crates/inkvec-py/Cargo.toml
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: sdist
path: dist/*.tar.gz
Expand All @@ -301,11 +301,11 @@ jobs:
- { name: linux-x64, os: ubuntu-latest, rid: linux-x64, native: libinkvec_ffi.so }
- { name: macos-arm64, os: macos-14, rid: osx-arm64, native: libinkvec_ffi.dylib }
steps:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
- uses: actions/checkout@v7
- uses: actions/setup-dotnet@v6
with:
dotnet-version: "8.0.x"
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: c-${{ matrix.name }}
path: dl
Expand All @@ -332,11 +332,11 @@ jobs:
needs: [c-library, dotnet-test]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
- uses: actions/checkout@v7
- uses: actions/setup-dotnet@v6
with:
dotnet-version: "8.0.x"
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
pattern: c-*
path: dl
Expand All @@ -360,7 +360,7 @@ jobs:
done
find packages/dotnet/runtimes -type f
- run: dotnet pack packages/dotnet/src/LogoLabs.Inkvec -c Release -o dist
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: dotnet-nupkg
path: |
Expand All @@ -385,12 +385,12 @@ jobs:
permissions:
id-token: write
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
pattern: wheel-*
path: dist
merge-multiple: true
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: sdist
path: dist
Expand All @@ -408,11 +408,11 @@ jobs:
env:
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: dotnet-nupkg
path: dist
- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v6
with:
dotnet-version: "8.0.x"
- name: Publish
Expand All @@ -432,7 +432,7 @@ jobs:
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
- name: Publish
if: env.CARGO_REGISTRY_TOKEN != ''
Expand All @@ -448,7 +448,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
pattern: c-*
path: out
Expand All @@ -457,7 +457,7 @@ jobs:
run: cd out && sha256sum -- * > SHA256SUMS-c
# `draft: true` on purpose: the release stays a draft until a maintainer publishes
# it (see release.yml). Leaving it out makes the action publish the draft it finds.
- uses: softprops/action-gh-release@v2
- uses: softprops/action-gh-release@v3
with:
draft: true
tag_name: ${{ github.ref_name }}
Expand Down
40 changes: 20 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
- uses: Swatinem/rust-cache@v2
- run: cargo build --release --workspace
Expand All @@ -48,11 +48,11 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 75
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
- uses: Swatinem/rust-cache@v2
- run: cargo build --release -p inkvec-cli
- uses: actions/setup-python@v5
- uses: actions/setup-python@v7
with:
python-version: "3.11"
- run: pip install numpy scipy pillow scikit-image resvg_py svgelements
Expand All @@ -71,7 +71,7 @@ jobs:
run: >-
python bench/ci_gate.py --exe target/release/inkvec --workers 4
--report-json gate/report.json --artifact-dir gate
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: ${{ !cancelled() }}
with:
name: gate-baseline
Expand All @@ -84,11 +84,11 @@ jobs:
name: minifier gate
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
- uses: Swatinem/rust-cache@v2
- run: cargo build --release -p inkvec-svgmin
- uses: actions/setup-python@v5
- uses: actions/setup-python@v7
with:
python-version: "3.11"
- run: pip install numpy pillow scikit-image resvg_py svgelements
Expand All @@ -103,15 +103,15 @@ jobs:
name: quality ratchet
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
with:
components: clippy, rustfmt, llvm-tools-preview
- uses: Swatinem/rust-cache@v2
- uses: taiki-e/install-action@v2
with:
tool: cargo-llvm-cov,cargo-machete
- uses: actions/setup-python@v5
- uses: actions/setup-python@v7
with:
python-version: "3.11"
- run: python -m unittest discover -s bench/tests -p test_quality.py
Expand All @@ -121,7 +121,7 @@ jobs:
name: fmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
with:
components: rustfmt
Expand All @@ -134,7 +134,7 @@ jobs:
name: clippy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
with:
components: clippy
Expand All @@ -147,29 +147,29 @@ jobs:
env:
RUSTDOCFLAGS: -Dwarnings
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
- uses: Swatinem/rust-cache@v2
- run: cargo doc --workspace --no-deps

msrv:
# Pinned to the exact rust-version in the workspace Cargo.toml. If that version is
# bumped, bump the toolchain input here in the same PR.
name: msrv (1.88)
name: msrv (1.89)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@master
with:
toolchain: "1.88"
toolchain: "1.89"
- uses: Swatinem/rust-cache@v2
- run: cargo check --workspace

wasm:
name: wasm
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
with:
targets: wasm32-unknown-unknown
Expand All @@ -183,7 +183,7 @@ jobs:
name: restore-model build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
- uses: Swatinem/rust-cache@v2
- run: cargo build --release -p inkvec-cli --features restore-model
Expand All @@ -196,8 +196,8 @@ jobs:
name: versions
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@v7
- uses: actions/setup-python@v7
with:
python-version: "3.11"
- run: python tools/check_versions.py
Expand All @@ -210,10 +210,10 @@ jobs:
env:
CARGO_TERM_COLOR: never
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@1.98.0
- uses: Swatinem/rust-cache@v2
- uses: actions/setup-python@v5
- uses: actions/setup-python@v7
with:
python-version: "3.11"
- run: python tools/third_party.py --check
Loading
Loading