Skip to content

Commit e99fde2

Browse files
fix: run pr branch version of mk_all (#25624)
If `master` is on a different toolchain than the PR, then its `mk_all` doesn't work; we fix that by just running the PR branch's version of `mk_all` inside `landrun`.
1 parent 3c68958 commit e99fde2

4 files changed

Lines changed: 16 additions & 28 deletions

File tree

.github/build.in.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,8 @@ jobs:
136136
shell: bash # We're only building the `master` branch version of the tools, so don't need to run inside landrun.
137137
run: |
138138
cd master-branch
139-
lake build cache mk_all check-yaml graph
139+
lake build cache check-yaml graph
140140
ls .lake/build/bin/cache
141-
ls .lake/build/bin/mk_all
142141
ls .lake/build/bin/check-yaml
143142
ls .lake/packages/importGraph/.lake/build/bin/graph
144143
@@ -219,13 +218,11 @@ jobs:
219218
- name: update {Mathlib, Tactic, Counterexamples, Archive}.lean
220219
id: mk_all
221220
continue-on-error: true # Allow workflow to continue, outcome checked later
222-
# This only runs `mk_all --check` from the `master-branch`, so doesn't need to be inside landrun
223-
shell: bash
221+
# This runs `mk_all --check` from the `pr-branch` inside landrun
224222
run: |
225223
cd pr-branch
226-
227-
echo "Running mk_all --check (from master-branch)..."
228-
LAKE_HOME="$TOOLCHAIN_DIR" ../master-branch/.lake/build/bin/mk_all --check
224+
echo "Running mk_all --check (from pr-branch)..."
225+
lake exe mk_all --check
229226
230227
- name: begin gh-problem-match-wrap for build step
231228
uses: leanprover-community/gh-problem-matcher-wrap@20007cb926a46aa324653a387363b52f07709845 # 2025-04-23

.github/workflows/bors.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,8 @@ jobs:
146146
shell: bash # We're only building the `master` branch version of the tools, so don't need to run inside landrun.
147147
run: |
148148
cd master-branch
149-
lake build cache mk_all check-yaml graph
149+
lake build cache check-yaml graph
150150
ls .lake/build/bin/cache
151-
ls .lake/build/bin/mk_all
152151
ls .lake/build/bin/check-yaml
153152
ls .lake/packages/importGraph/.lake/build/bin/graph
154153
@@ -229,13 +228,11 @@ jobs:
229228
- name: update {Mathlib, Tactic, Counterexamples, Archive}.lean
230229
id: mk_all
231230
continue-on-error: true # Allow workflow to continue, outcome checked later
232-
# This only runs `mk_all --check` from the `master-branch`, so doesn't need to be inside landrun
233-
shell: bash
231+
# This runs `mk_all --check` from the `pr-branch` inside landrun
234232
run: |
235233
cd pr-branch
236-
237-
echo "Running mk_all --check (from master-branch)..."
238-
LAKE_HOME="$TOOLCHAIN_DIR" ../master-branch/.lake/build/bin/mk_all --check
234+
echo "Running mk_all --check (from pr-branch)..."
235+
lake exe mk_all --check
239236
240237
- name: begin gh-problem-match-wrap for build step
241238
uses: leanprover-community/gh-problem-matcher-wrap@20007cb926a46aa324653a387363b52f07709845 # 2025-04-23

.github/workflows/build.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,8 @@ jobs:
153153
shell: bash # We're only building the `master` branch version of the tools, so don't need to run inside landrun.
154154
run: |
155155
cd master-branch
156-
lake build cache mk_all check-yaml graph
156+
lake build cache check-yaml graph
157157
ls .lake/build/bin/cache
158-
ls .lake/build/bin/mk_all
159158
ls .lake/build/bin/check-yaml
160159
ls .lake/packages/importGraph/.lake/build/bin/graph
161160
@@ -236,13 +235,11 @@ jobs:
236235
- name: update {Mathlib, Tactic, Counterexamples, Archive}.lean
237236
id: mk_all
238237
continue-on-error: true # Allow workflow to continue, outcome checked later
239-
# This only runs `mk_all --check` from the `master-branch`, so doesn't need to be inside landrun
240-
shell: bash
238+
# This runs `mk_all --check` from the `pr-branch` inside landrun
241239
run: |
242240
cd pr-branch
243-
244-
echo "Running mk_all --check (from master-branch)..."
245-
LAKE_HOME="$TOOLCHAIN_DIR" ../master-branch/.lake/build/bin/mk_all --check
241+
echo "Running mk_all --check (from pr-branch)..."
242+
lake exe mk_all --check
246243
247244
- name: begin gh-problem-match-wrap for build step
248245
uses: leanprover-community/gh-problem-matcher-wrap@20007cb926a46aa324653a387363b52f07709845 # 2025-04-23

.github/workflows/build_fork.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,8 @@ jobs:
150150
shell: bash # We're only building the `master` branch version of the tools, so don't need to run inside landrun.
151151
run: |
152152
cd master-branch
153-
lake build cache mk_all check-yaml graph
153+
lake build cache check-yaml graph
154154
ls .lake/build/bin/cache
155-
ls .lake/build/bin/mk_all
156155
ls .lake/build/bin/check-yaml
157156
ls .lake/packages/importGraph/.lake/build/bin/graph
158157
@@ -233,13 +232,11 @@ jobs:
233232
- name: update {Mathlib, Tactic, Counterexamples, Archive}.lean
234233
id: mk_all
235234
continue-on-error: true # Allow workflow to continue, outcome checked later
236-
# This only runs `mk_all --check` from the `master-branch`, so doesn't need to be inside landrun
237-
shell: bash
235+
# This runs `mk_all --check` from the `pr-branch` inside landrun
238236
run: |
239237
cd pr-branch
240-
241-
echo "Running mk_all --check (from master-branch)..."
242-
LAKE_HOME="$TOOLCHAIN_DIR" ../master-branch/.lake/build/bin/mk_all --check
238+
echo "Running mk_all --check (from pr-branch)..."
239+
lake exe mk_all --check
243240
244241
- name: begin gh-problem-match-wrap for build step
245242
uses: leanprover-community/gh-problem-matcher-wrap@20007cb926a46aa324653a387363b52f07709845 # 2025-04-23

0 commit comments

Comments
 (0)