Skip to content
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.

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

[MERGE ME] Split Sargon into many crates #318

Merged
merged 14 commits into from
Jan 8, 2025
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 3 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,14 @@ jobs:
latest_tag_version=$latest_tag

# Extract the version from both Cargo.toml in the PR branch
pr_version_sargon=$(grep '^version' crates/sargon/Cargo.toml | sed 's/version = "\(.*\)"/\1/')
pr_version_sargon_uniffi=$(grep '^version' crates/sargon-uniffi/Cargo.toml | sed 's/version = "\(.*\)"/\1/')
pr_version_sargon_uniffi=$(grep '^version' crates/uniffi/uniffi_SPLIT_ME/Cargo.toml | sed 's/version = "\(.*\)"/\1/')

echo "Latest tag version: $latest_tag_version"
echo "PR version sargon: $pr_version_sargon"
echo "PR version sargon-uniffi: $pr_version_sargon_uniffi"

# Check if sargon and sargon-uniffi versions match
if [ "$pr_version_sargon" != "$pr_version_sargon_uniffi" ]; then
echo "Error: sargon version ($pr_version_sargon) does not match sargon-uniffi version ($pr_version_sargon_uniffi)."
exit 1
fi


# Split the versions into major, minor, and patch components
IFS='.' read -r -a tag_version_parts <<< "$latest_tag_version"
IFS='.' read -r -a pr_version_parts <<< "$pr_version_sargon"
IFS='.' read -r -a pr_version_parts <<< "$pr_version_sargon_uniffi"

major_diff=$((pr_version_parts[0] - tag_version_parts[0]))
minor_diff=$((pr_version_parts[1] - tag_version_parts[1]))
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ repos:
name: unit tests
language: system
types: [file, rust]
entry: cargo test --lib
entry: cargo test --workspace --lib
pass_filenames: false
4 changes: 3 additions & 1 deletion .swiftformat
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--swiftversion 5.9

--exclude apple/Sources/UniFFI/**

# format options
--allman false # Prefer `K&R` https://en.wikipedia.org/wiki/Indentation_style#K&R_style
--indent tab
Expand All @@ -10,4 +12,4 @@
--disable redundantNilInit,redundantSelf,extensionAccessControl
--lineaftermarks false
--ifdef no-indent
--header strip
--header strip
Loading
Loading