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

Finn Evers created 4 weeks ago

Also does some more cleanup here and there.

Release Notes:

- N/A

Change summary

.github/workflows/extension_bump.yml                | 9 +++------
tooling/xtask/src/tasks/workflows/extension_bump.rs | 9 +++------
2 files changed, 6 insertions(+), 12 deletions(-)

Detailed changes

.github/workflows/extension_bump.yml

@@ -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

tooling/xtask/src/tasks/workflows/extension_bump.rs

@@ -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