From 99aacaaaa06325a9c10d8b9d024761f9fa958569 Mon Sep 17 00:00:00 2001
From: Daniel Szoke <daniel.szoke@sentry.io>
Date: Mon, 22 Sep 2025 11:32:13 +0200
Subject: [PATCH 1/2] ci(rust): Run CI against toolchain update bot PRs

---
 .github/workflows/ci.yml                    |  2 ++
 .github/workflows/rust-toolchain-update.yml | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6b5e2bfaa7..76fe6354f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,6 +9,8 @@ on:
 
   pull_request:
 
+  workflow_dispatch:
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
diff --git a/.github/workflows/rust-toolchain-update.yml b/.github/workflows/rust-toolchain-update.yml
index 2478f351a5..31b1ec2fd5 100644
--- a/.github/workflows/rust-toolchain-update.yml
+++ b/.github/workflows/rust-toolchain-update.yml
@@ -13,6 +13,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
+      actions: write
 
     steps:
       - name: Checkout Repository
@@ -127,3 +128,12 @@ jobs:
             });
 
             console.log(`Created PR #${pr.number}: ${pr.title}`);
+
+            // Run the CI workflow on the PR branch. Needed because GITHUB_TOKEN
+            // doesn't trigger workflows, except for workflow_dispatch.
+            await github.rest.actions.createWorkflowDispatch({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'ci.yml',
+              ref: branchName,
+            });

From 48e20ba3d5d3fc248592d900f128af6af69ba399 Mon Sep 17 00:00:00 2001
From: Daniel Szoke <daniel.szoke@sentry.io>
Date: Fri, 12 Sep 2025 17:47:44 +0200
Subject: [PATCH 2/2] test action with PR trigger and older Rust version

---
 .github/workflows/rust-toolchain-update.yml | 3 ++-
 rust-toolchain.toml                         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust-toolchain-update.yml b/.github/workflows/rust-toolchain-update.yml
index 31b1ec2fd5..60fa763309 100644
--- a/.github/workflows/rust-toolchain-update.yml
+++ b/.github/workflows/rust-toolchain-update.yml
@@ -4,6 +4,7 @@ on:
   schedule:
     # Run weekly on Mondays at 00:00 UTC
     - cron: '0 0 * * 1'
+  pull_request:
 
 jobs:
   check-and-update:
@@ -107,7 +108,7 @@ jobs:
               repo: context.repo.repo,
               title: commitTitle,
               head: branchName,
-              base: '${{ github.ref_name }}',
+              base: '${{ github.head_ref }}',
               body: `Update Rust toolchain to ${newVersion} (${fullVersion}).
 
               **Changes:**
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 6697c67365..78ad751080 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 # We pin the minor version to prevent new Clippy lints from breaking CI.
 # But, we still want to pick up new patch versions.
-channel = "1.89"
+channel = "1.88"