Skip to content

fix: Remove use of workspace versioning for the moment #1136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpeacock merged 6 commits into from
May 27, 2025
Merged

fix: Remove use of workspace versioning for the moment #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
621b2e8
fix: Remove use of workspace versioning for the moment
scouten-adobe May 27, 2025
659497a
Restore explicit version reference :-/
scouten-adobe May 27, 2025
41991aa
Update Cargo.lock
scouten-adobe May 27, 2025
98ab364
build: update test-wasi for conflict
gpeacock May 27, 2025
55f9b78
test: Remove c2patool from wasi test
gpeacock May 27, 2025
88a99da
Merge branch 'main' into fix-c2pa-dep
gpeacock May 27, 2025
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ test-wasi:
ifeq ($(PLATFORM),mac)
$(eval CC := /opt/homebrew/opt/llvm/bin/clang)
endif
CC=$(CC) CARGO_TARGET_WASM32_WASIP2_RUNNER="wasmtime -S cli -S http --dir ." cargo +nightly test --target wasm32-wasip2 -p c2pa -p c2patool --all-features
CC=$(CC) CARGO_TARGET_WASM32_WASIP2_RUNNER="wasmtime -S cli -S http --dir ." cargo +nightly test --target wasm32-wasip2 -p c2pa --no-default-features --features="rust_native_crypto, file_io, fetch_remote_manifests, add_thumbnails, v1_api"
rm -r sdk/Users

# Full local validation, build and test all features including wasm
Expand Down
4 changes: 1 addition & 3 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(test)'] }
[dependencies]
anyhow = "1.0"
atree = "0.5.2"
c2pa = { workspace = true , features = [
Copy link
Copy Markdown
Member

@gpeacock gpeacock May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I didn't intend to sync c2patool with this change yet.

Copy link
Copy Markdown
Member

@gpeacock gpeacock May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose it doesn't hurt but it could be confusing if we don't keep everything in sync. Won't the other crates have the same issue?

Copy link
Copy Markdown
Collaborator Author

@scouten-adobe scouten-adobe May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the cargo team doesn't plan to support this syntax for cargo publish: rust-lang/cargo#11133

Copy link
Copy Markdown
Member

@gpeacock gpeacock May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Someone else on that thread resolved the issue by moving to workspace packaging
boa-dev/boa#2297

c2pa = { path = "../sdk", version = "0.54.0", features = [
"fetch_remote_manifests",
"file_io",
"add_thumbnails",
Expand Down Expand Up @@ -56,5 +56,3 @@ mockall = "0.13.0"
assert_cmd = "2.0.14"
httpmock = "0.7.0"
predicates = "3.1"


Loading