Move SHOP_REV to where shop takes makeover 2.5.0
The rust-stage cell found this on its first clean run: the image build
died at STEP 17 staging the Akari themes, because the glob found two
makeover versions in the shared registry and asserts there is one.
shop at 03b0562 locks makeover 2.4.1; the console locks 2.5.0. Both
build --locked into one CARGO_HOME, so cargo extracted both. shop@7b68d26
takes 2.5.0 and the two agree again.
That commit existed only on fw13 until now, which is why the fix was not
reachable: the build fetches shop over HTTPS from makenot.work, and
mnw/main was still the pinned 03b0562.
The guard is worth keeping as it is until somebody decides otherwise, but
it does assert uniqueness rather than naming the version it wanted, so
the next skew between these two pins breaks the build the same way.
1 file changed,
+1 insertion,
-1 deletion
| 94 |
94 |
|
# alone, so console edits — the thing that changes most often — reuse it
|
| 95 |
95 |
|
# instead of rebuilding a terminal that did not change. Moving it below the
|
| 96 |
96 |
|
# `COPY crates/` would defeat the dependency-cache split that follows.
|
| 97 |
|
- |
ARG SHOP_REV=03b0562a109f68c6e0f466d81abf1fe3c849f009
|
|
97 |
+ |
ARG SHOP_REV=7b68d26052acfe33ca6549a35c6408212983deaf
|
| 98 |
98 |
|
|
| 99 |
99 |
|
# Does the remote have anything to build from, before anything expensive runs.
|
| 100 |
100 |
|
#
|