From d249b70135dd1293f0efc1952d2c355cac2703c2 Mon Sep 17 00:00:00 2001
From: jupblb <michal.kielbowicz@sourcegraph.com>
Date: Thu, 26 Feb 2026 12:41:07 +0100
Subject: [PATCH 1/2] Merge protobuf-reprolang workflow into nix-checks

---
 .github/workflows/nix-checks.yaml        | 19 ++++++++++++-------
 .github/workflows/protobuf-reprolang.yml | 24 ------------------------
 2 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 .github/workflows/protobuf-reprolang.yml

diff --git a/.github/workflows/nix-checks.yaml b/.github/workflows/nix-checks.yaml
index e8ddd502..d3d8618b 100644
--- a/.github/workflows/nix-checks.yaml
+++ b/.github/workflows/nix-checks.yaml
@@ -22,15 +22,20 @@ jobs:
       - uses: DeterminateSystems/magic-nix-cache-action@v13
       - run: nix build .#checks.x86_64-linux.${{ matrix.check }}
 
-  packages:
+  scip:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: DeterminateSystems/nix-installer-action@v21
+      - uses: DeterminateSystems/magic-nix-cache-action@v13
+      - run: nix build scip
+
+  proto-generate:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        package:
-          - scip
-          - proto-generate
     steps:
       - uses: actions/checkout@v6
       - uses: DeterminateSystems/nix-installer-action@v21
       - uses: DeterminateSystems/magic-nix-cache-action@v13
-      - run: nix build .#${{ matrix.package }}
+      - name: Regenerate protobuf bindings
+        run: nix run .#proto-generate
+      - run: git diff --exit-code
diff --git a/.github/workflows/protobuf-reprolang.yml b/.github/workflows/protobuf-reprolang.yml
deleted file mode 100644
index d2b73d2f..00000000
--- a/.github/workflows/protobuf-reprolang.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Generated code is up to date
-
-on:
-  pull_request:
-    paths:
-      - '.github/workflows/**'
-      - 'docs/**'
-      - 'bindings/**'
-      - 'scip.proto'
-      - 'buf**'
-      - 'flake.nix'
-      - 'flake.lock'
-      - 'cmd/scip/tests/reprolang/**'
-
-jobs:
-  gen-up-to-date:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: DeterminateSystems/nix-installer-action@v21
-      - uses: DeterminateSystems/magic-nix-cache-action@v13
-      - name: Regenerate protobuf bindings
-        run: nix run .#proto-generate
-      - run: git diff --exit-code

From 40427bd7989cb6193911781ab262f62ea6e49d14 Mon Sep 17 00:00:00 2001
From: jupblb <michal.kielbowicz@sourcegraph.com>
Date: Thu, 26 Feb 2026 12:52:44 +0100
Subject: [PATCH 2/2] nix-checks: consolidate scip and proto-generate into
 matrix job

---
 .github/workflows/nix-checks.yaml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/nix-checks.yaml b/.github/workflows/nix-checks.yaml
index d3d8618b..a255ba09 100644
--- a/.github/workflows/nix-checks.yaml
+++ b/.github/workflows/nix-checks.yaml
@@ -22,20 +22,16 @@ jobs:
       - uses: DeterminateSystems/magic-nix-cache-action@v13
       - run: nix build .#checks.x86_64-linux.${{ matrix.check }}
 
-  scip:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: DeterminateSystems/nix-installer-action@v21
-      - uses: DeterminateSystems/magic-nix-cache-action@v13
-      - run: nix build scip
-
-  proto-generate:
+  runs:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        package:
+          - scip
+          - proto-generate
     steps:
       - uses: actions/checkout@v6
       - uses: DeterminateSystems/nix-installer-action@v21
       - uses: DeterminateSystems/magic-nix-cache-action@v13
-      - name: Regenerate protobuf bindings
-        run: nix run .#proto-generate
+      - run: nix run .#${{ matrix.package }}
       - run: git diff --exit-code