fix(pre-release): update job dependencies and streamline version bump process (#17321)

Author: diemol

.github/workflows/pre-release.yml

@@ -28,7 +28,7 @@ jobs:
   # Do not need to lock trunk before Rust jobs since work is in a separate branch
   generate-rust-version:
     name: Generate Rust Version
-    needs: parse-tag
+    needs: [parse-tag, restrict-trunk]
     if: github.event.repository.fork == false && needs.parse-tag.outputs.language == 'all'
     uses: ./.github/workflows/bazel.yml
     with:
@@ -90,7 +90,7 @@ jobs:
 
   update-versions:
     name: Bump Versions
-    needs: [parse-tag, restrict-trunk]
+    needs: [parse-tag, restrict-trunk, cleanup-rust-branch]
     uses: ./.github/workflows/bazel.yml
     with:
       name: Bump versions
@@ -148,7 +148,7 @@ jobs:
     with:
       name: Run dependency updates
       ref: staging/release-${{ needs.parse-tag.outputs.tag }}
-      run: ./go ${{ needs.parse-tag.outputs.language }}:update
+      run: ./go ${{ needs.parse-tag.outputs.language }}:update${{ needs.parse-tag.outputs.language == 'all' && ' && ./go rust:update' || '' }}
       artifact-name: patch-dep-updates
 
   calculate-changelog-depth:

rake_tasks/rust.rake

@@ -57,16 +57,4 @@ task :version, [:version] do |_task, arguments|
     text = File.read(file).gsub(old_version, new_version)
     File.open(file, 'w') { |f| f.puts text }
   end
-
-  # Repin cargo immediately after updating the version so Cargo.Bazel.lock is
-  # never left in a stale state between jobs.  Running CARGO_BAZEL_REPIN=true
-  # against a Cargo.toml whose version has already changed (but whose lockfile
-  # hasn't been updated yet) causes Bazel to detect a mid-evaluation file-hash
-  # conflict and crash (rules_rust extensions.bzl reads the lockfile twice
-  # within the same Bazel evaluation).
-  # reenable is required because Rake::Task#invoke is a no-op if the task has
-  # already run once in this Ruby process (e.g. when multiple tasks are chained
-  # in a single ./go invocation).
-  Rake::Task['rust:update'].reenable
-  Rake::Task['rust:update'].invoke
 end