From f1c14a0d83dfdc9cacc97918d181ed389e3e2b0e Mon Sep 17 00:00:00 2001 From: Alexander Cyon Date: Sat, 4 Jan 2025 15:24:11 +0100 Subject: [PATCH] fix ci --- .github/workflows/test.yml | 14 +++----------- crates/{sargon_SPLIT_ME/src => }/Package.swift | 0 2 files changed, 3 insertions(+), 11 deletions(-) rename crates/{sargon_SPLIT_ME/src => }/Package.swift (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 45413dafd..f046c486b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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])) diff --git a/crates/sargon_SPLIT_ME/src/Package.swift b/crates/Package.swift similarity index 100% rename from crates/sargon_SPLIT_ME/src/Package.swift rename to crates/Package.swift