extension_ci: Use more robust bash syntax for bump_extension_version (#43955)

Also does some more cleanup here and there.

Release Notes:

- N/A
This commit is contained in:
Finn Evers 2025-12-02 00:38:05 +01:00 committed by GitHub
parent 34a2bfd6b7
commit 9c4e16088c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 12 deletions

View file

@ -114,15 +114,12 @@ jobs:
run: |
OLD_VERSION="${{ needs.check_bump_needed.outputs.current_version }}"
if [[ -f "extension.toml" ]]; then
EXTENSION_TOML="extension.toml"
fi
BUMP_FILES=("extension.toml")
if [[ -f "Cargo.toml" ]]; then
CARGO_TOML="Cargo.toml"
BUMP_FILES+=("Cargo.toml")
fi
bump2version --verbose --current-version "$OLD_VERSION" --no-configured-files ${{ inputs.bump-type }} "$EXTENSION_TOML" "$CARGO_TOML"
bump2version --verbose --current-version "$OLD_VERSION" --no-configured-files ${{ inputs.bump-type }} "${BUMP_FILES[@]}"
if [[ -f "Cargo.toml" ]]; then
cargo update --workspace

View file

@ -242,15 +242,12 @@ fn bump_version(current_version: &JobOutput, bump_type: &WorkflowInput) -> (Step
indoc! {r#"
OLD_VERSION="{}"
if [[ -f "extension.toml" ]]; then
EXTENSION_TOML="extension.toml"
fi
BUMP_FILES=("extension.toml")
if [[ -f "Cargo.toml" ]]; then
CARGO_TOML="Cargo.toml"
BUMP_FILES+=("Cargo.toml")
fi
bump2version --verbose --current-version "$OLD_VERSION" --no-configured-files {} "$EXTENSION_TOML" "$CARGO_TOML"
bump2version --verbose --current-version "$OLD_VERSION" --no-configured-files {} "${{BUMP_FILES[@]}}"
if [[ -f "Cargo.toml" ]]; then
cargo update --workspace