diff --git a/.github/workflows/extension_bump.yml b/.github/workflows/extension_bump.yml index 263b42a50a..afb5448691 100644 --- a/.github/workflows/extension_bump.yml +++ b/.github/workflows/extension_bump.yml @@ -37,7 +37,7 @@ jobs: - id: compare-versions-check name: extension_bump::compare_versions run: | - CURRENT_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)" + CURRENT_VERSION="$(sed -n 's/^version = \"\(.*\)\"/\1/p' < extension.toml | tr -d '[:space:]')" PR_PARENT_SHA="${{ github.event.pull_request.head.sha }}" if [[ -n "$PR_PARENT_SHA" ]]; then @@ -48,7 +48,7 @@ jobs: git checkout "$(git log -1 --format=%H)"~1 fi - PARENT_COMMIT_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)" + PARENT_COMMIT_VERSION="$(sed -n 's/^version = \"\(.*\)\"/\1/p' < extension.toml | tr -d '[:space:]')" [[ "$CURRENT_VERSION" == "$PARENT_COMMIT_VERSION" ]] && \ echo "version_changed=false" >> "$GITHUB_OUTPUT" || \ @@ -99,7 +99,7 @@ jobs: cargo update --workspace fi - NEW_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)" + NEW_VERSION="$(sed -n 's/^version = \"\(.*\)\"/\1/p' < extension.toml | tr -d '[:space:]')" echo "new_version=${NEW_VERSION}" >> "$GITHUB_OUTPUT" - name: extension_bump::create_pull_request diff --git a/.github/workflows/extension_tests.yml b/.github/workflows/extension_tests.yml index 947fb3c5c9..28eb08cdab 100644 --- a/.github/workflows/extension_tests.yml +++ b/.github/workflows/extension_tests.yml @@ -106,7 +106,7 @@ jobs: - id: compare-versions-check name: extension_bump::compare_versions run: | - CURRENT_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)" + CURRENT_VERSION="$(sed -n 's/^version = \"\(.*\)\"/\1/p' < extension.toml | tr -d '[:space:]')" PR_PARENT_SHA="${{ github.event.pull_request.head.sha }}" if [[ -n "$PR_PARENT_SHA" ]]; then @@ -117,7 +117,7 @@ jobs: git checkout "$(git log -1 --format=%H)"~1 fi - PARENT_COMMIT_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)" + PARENT_COMMIT_VERSION="$(sed -n 's/^version = \"\(.*\)\"/\1/p' < extension.toml | tr -d '[:space:]')" [[ "$CURRENT_VERSION" == "$PARENT_COMMIT_VERSION" ]] && \ echo "version_changed=false" >> "$GITHUB_OUTPUT" || \ diff --git a/tooling/xtask/src/tasks/workflows/extension_bump.rs b/tooling/xtask/src/tasks/workflows/extension_bump.rs index fcc73bce39..eed7c79c8c 100644 --- a/tooling/xtask/src/tasks/workflows/extension_bump.rs +++ b/tooling/xtask/src/tasks/workflows/extension_bump.rs @@ -13,7 +13,8 @@ use crate::tasks::workflows::{ }, }; -const VERSION_CHECK: &str = r#"sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml"#; +const VERSION_CHECK: &str = + r#"sed -n 's/^version = \"\(.*\)\"/\1/p' < extension.toml | tr -d '[:space:]'"#; // This is used by various extensions repos in the zed-extensions org to bump extension versions. pub(crate) fn extension_bump() -> Workflow {