From fecfa1e42d53a7733771e9d0d08c21b3f9c7c1b5 Mon Sep 17 00:00:00 2001
From: Alex Stephen <alexstephen@google.com>
Date: Tue, 13 Oct 2026 20:19:38 +0000
Subject: [PATCH] CI: Cancel stale merge queue runs and move license check to
 ubuntu-slim

A PR re-added to the merge queue reuses the same queue branch, so its
runs waited behind the previous attempt's still-queued runs in the same
concurrency group. Cancel in-progress runs for merge_group as well.

Run the license check on ubuntu-slim to reduce demand for ubuntu-latest
runners. That image has no Java, so install it explicitly.
---
 .github/workflows/license_check.yml      | 6 +++++-
 .github/workflows/python-ci-docs.yml     | 2 +-
 .github/workflows/python-ci.yml          | 2 +-
 .github/workflows/python-integration.yml | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/license_check.yml b/.github/workflows/license_check.yml
index b5bf11b8ad..a6155c84cc 100644
--- a/.github/workflows/license_check.yml
+++ b/.github/workflows/license_check.yml
@@ -27,9 +27,13 @@ permissions:
 
 jobs:
   rat:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
     - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       with:
         persist-credentials: false
+    - uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
+      with:
+        distribution: temurin
+        java-version: 21
     - run: dev/check-license
diff --git a/.github/workflows/python-ci-docs.yml b/.github/workflows/python-ci-docs.yml
index 35bbc4441c..65c15cd51a 100644
--- a/.github/workflows/python-ci-docs.yml
+++ b/.github/workflows/python-ci-docs.yml
@@ -29,7 +29,7 @@ permissions:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  cancel-in-progress: true
 
 jobs:
   docs:
diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index db1e9ff3ea..06a0af5700 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -28,7 +28,7 @@ permissions:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  cancel-in-progress: true
 
 jobs:
   lint-and-unit-test:
diff --git a/.github/workflows/python-integration.yml b/.github/workflows/python-integration.yml
index 9dae683aa8..6d05c015a4 100644
--- a/.github/workflows/python-integration.yml
+++ b/.github/workflows/python-integration.yml
@@ -28,7 +28,7 @@ permissions:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  cancel-in-progress: true
 
 jobs:
   integration-test: