mirror of
https://github.com/visioncortex/vtracer.git
synced 2026-09-12 07:06:03 -07:00
Depend on published visioncortex 0.9.0; simplify CI
visioncortex 0.9.0 is on crates.io, so the workspace now uses the registry version instead of the local `../visioncortex` path (a [patch.crates-io] example is left in a comment for local visioncortex development). CI no longer needs the adjacent visioncortex checkout / published-crate caveats: rust.yml, python.yml, and release.yml build from a single checkout.
This commit is contained in:
@@ -1,11 +1,5 @@
|
|||||||
# Python wheels for crates/vtracer-py (maturin). Regenerate the skeleton with:
|
# Python wheels for crates/vtracer-py (maturin). Regenerate the skeleton with:
|
||||||
# maturin generate-ci github -m crates/vtracer-py/Cargo.toml
|
# maturin generate-ci github -m crates/vtracer-py/Cargo.toml
|
||||||
#
|
|
||||||
# PREREQUISITE: the framework depends on visioncortex 0.9.0. maturin's Linux
|
|
||||||
# builds run in manylinux containers where the local `../visioncortex` path is
|
|
||||||
# not visible, so this workflow only succeeds once visioncortex 0.9.0 is
|
|
||||||
# published to crates.io and the workspace uses the registry version (not the
|
|
||||||
# local path).
|
|
||||||
name: Python
|
name: Python
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
name: Release
|
name: Release
|
||||||
|
|
||||||
# Builds the `vtracer` CLI binary (crates/vtracer-cli) for each target.
|
# Builds the `vtracer` CLI binary (crates/vtracer-cli) for each target.
|
||||||
# PREREQUISITE: the workspace depends on visioncortex 0.9.0; this succeeds once
|
|
||||||
# 0.9.0 is published to crates.io and the workspace uses the registry version
|
|
||||||
# instead of the local `../visioncortex` path.
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
release:
|
release:
|
||||||
|
|||||||
@@ -21,26 +21,14 @@ concurrency:
|
|||||||
env:
|
env:
|
||||||
CARGO_TERM_COLOR: always
|
CARGO_TERM_COLOR: always
|
||||||
|
|
||||||
# NOTE: the workspace depends on visioncortex 0.9.0 via a local path
|
|
||||||
# (`../visioncortex`). Until 0.9.0 is published to crates.io, CI checks out the
|
|
||||||
# visioncortex repo next to this one so the path resolves. This requires the
|
|
||||||
# 0.9.x changes to be present on visioncortex's default branch.
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
path: vtracer
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
repository: visioncortex/visioncortex
|
|
||||||
path: visioncortex
|
|
||||||
- name: Build
|
- name: Build
|
||||||
working-directory: vtracer
|
|
||||||
run: cargo build --workspace --verbose
|
run: cargo build --workspace --verbose
|
||||||
- name: Test
|
- name: Test
|
||||||
working-directory: vtracer
|
|
||||||
run: cargo test --workspace --verbose
|
run: cargo test --workspace --verbose
|
||||||
|
|
||||||
wasm:
|
wasm:
|
||||||
@@ -48,15 +36,8 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
path: vtracer
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
repository: visioncortex/visioncortex
|
|
||||||
path: visioncortex
|
|
||||||
- run: rustup target add wasm32-unknown-unknown
|
- run: rustup target add wasm32-unknown-unknown
|
||||||
- name: Build core for wasm32
|
- name: Build core for wasm32
|
||||||
working-directory: vtracer
|
|
||||||
run: cargo build --target wasm32-unknown-unknown -p vtracer
|
run: cargo build --target wasm32-unknown-unknown -p vtracer
|
||||||
|
|
||||||
nodejs:
|
nodejs:
|
||||||
@@ -64,19 +45,13 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
path: vtracer
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
repository: visioncortex/visioncortex
|
|
||||||
path: visioncortex
|
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 20
|
node-version: 20
|
||||||
- name: Install wasm-pack
|
- name: Install wasm-pack
|
||||||
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
|
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
|
||||||
- name: Build & test
|
- name: Build & test
|
||||||
working-directory: vtracer/nodejs
|
working-directory: nodejs
|
||||||
run: |
|
run: |
|
||||||
wasm-pack build --target nodejs --out-dir pkg
|
wasm-pack build --target nodejs --out-dir pkg
|
||||||
node test.js
|
node test.js
|
||||||
|
|||||||
+4
-3
@@ -26,6 +26,7 @@ homepage = "http://www.visioncortex.org/vtracer"
|
|||||||
repository = "https://github.com/visioncortex/vtracer/"
|
repository = "https://github.com/visioncortex/vtracer/"
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
# visioncortex 0.9.0 is currently unreleased; developed against the local
|
visioncortex = "0.9"
|
||||||
# checkout. Releases will pin a published 0.9.x.
|
# For local development against an unreleased visioncortex, add a patch:
|
||||||
visioncortex = { version = "0.9", path = "../visioncortex" }
|
# [patch.crates-io]
|
||||||
|
# visioncortex = { path = "../visioncortex" }
|
||||||
|
|||||||
Reference in New Issue
Block a user