Skip to content

Commit a9ad801

Browse files
committed
chore(deps): vendor xlings 0.4.67 for the multi-index_repo install fix (#238)
xlings 0.4.67 carries openxlings/xlings#374 (fix(xim): surface multi-repo install failures + best-effort catalog, cf9b60d5), so a workspace member with >=2 inherited index_repos installs uncached packages instead of failing silently at exit 1. Bump release/cross-build/e2e pins 0.4.62 -> 0.4.67.
1 parent 86e41ec commit a9ad801

3 files changed

Lines changed: 18 additions & 14 deletions

File tree

.github/workflows/ci-linux-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
159159
- name: Bootstrap xlings + released mcpp
160160
run: |
161-
curl -fsSL https://raw.githubusercontent.com/openxlings/xlings/main/tools/other/quick_install.sh | bash -s v0.4.62
161+
curl -fsSL https://raw.githubusercontent.com/openxlings/xlings/main/tools/other/quick_install.sh | bash -s v0.4.67
162162
export PATH="$HOME/.xlings/subos/current/bin:$PATH"
163163
xlings update
164164
xlings install mcpp -y -g

.github/workflows/cross-build-test.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,17 @@ jobs:
9292
- name: Bootstrap mcpp via xlings
9393
env:
9494
XLINGS_NON_INTERACTIVE: '1'
95-
# 0.4.62 (current) — kept in lock-step with the xlings the release
96-
# is built/bundled against (release.yml). A past 0.4.61 "download 404
95+
# 0.4.67 (current) — kept in lock-step with the xlings the release
96+
# is built/bundled against (release.yml). Bumped 0.4.62 -> 0.4.67 for
97+
# mcpp#238: xlings 0.4.67 carries the multi-index_repo install fix
98+
# (openxlings/xlings#374, commit cf9b60d5) so a workspace member with
99+
# >=2 inherited index_repos installs uncached packages instead of
100+
# failing silently. A past 0.4.61 "download 404
97101
# for mcpp@<pin>" was NOT a version bug — the xlings-res/mcpp GitHub
98102
# release assets were uploaded in a broken state (records present,
99103
# blobs missing → 404 on GET); re-uploaded clean. The stale-INDEX
100104
# half is handled by the marker-clear below.
101-
XLINGS_VERSION: '0.4.62'
105+
XLINGS_VERSION: '0.4.67'
102106
run: |
103107
tarball="xlings-${XLINGS_VERSION}-linux-x86_64.tar.gz"
104108
curl -fsSL -o "/tmp/${tarball}" \
@@ -211,7 +215,7 @@ jobs:
211215
- name: Bootstrap mcpp via xlings
212216
env:
213217
XLINGS_NON_INTERACTIVE: '1'
214-
XLINGS_VERSION: '0.4.62'
218+
XLINGS_VERSION: '0.4.67'
215219
run: |
216220
tarball="xlings-${XLINGS_VERSION}-linux-x86_64.tar.gz"
217221
curl -fsSL -o "/tmp/${tarball}" \

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
# Pin xlings to a known-good version. The upstream install
9797
# script always grabs `latest` (no version override), so we
9898
# download + self-install manually to avoid broken releases.
99-
XLINGS_VERSION: '0.4.62'
99+
XLINGS_VERSION: '0.4.67'
100100
run: |
101101
if [ ! -x "$HOME/.xlings/subos/default/bin/xlings" ]; then
102102
tarball="xlings-${XLINGS_VERSION}-linux-x86_64.tar.gz"
@@ -278,10 +278,10 @@ jobs:
278278
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
279279
echo "tag=v$VERSION" >> "$GITHUB_OUTPUT"
280280
281-
- name: Bootstrap mcpp via xlings (latest 0.4.62)
281+
- name: Bootstrap mcpp via xlings (latest 0.4.67)
282282
env:
283283
XLINGS_NON_INTERACTIVE: '1'
284-
XLINGS_VERSION: '0.4.62'
284+
XLINGS_VERSION: '0.4.67'
285285
run: |
286286
tarball="xlings-${XLINGS_VERSION}-linux-x86_64.tar.gz"
287287
curl -fsSL -o "/tmp/${tarball}" \
@@ -336,13 +336,13 @@ jobs:
336336
exec "$(dirname "$0")/bin/mcpp" "$@"
337337
LAUNCHER
338338
chmod +x "$STAGING/$WRAPPER/mcpp"
339-
# Bundle the aarch64 xlings (0.4.62) so install.sh consumers on aarch64
339+
# Bundle the aarch64 xlings (0.4.67) so install.sh consumers on aarch64
340340
# get an aarch64 xlings, not the x86_64 bootstrap one.
341-
XLA="xlings-0.4.62-linux-aarch64.tar.gz"
341+
XLA="xlings-0.4.67-linux-aarch64.tar.gz"
342342
if curl -fsSL -o "/tmp/$XLA" \
343-
"https://github.com/openxlings/xlings/releases/download/v0.4.62/$XLA"; then
343+
"https://github.com/openxlings/xlings/releases/download/v0.4.67/$XLA"; then
344344
tar -xzf "/tmp/$XLA" -C /tmp
345-
XLBIN=$(find /tmp/xlings-0.4.62-linux-aarch64 -path '*/bin/xlings' -type f | head -1)
345+
XLBIN=$(find /tmp/xlings-0.4.67-linux-aarch64 -path '*/bin/xlings' -type f | head -1)
346346
if [ -n "$XLBIN" ]; then
347347
mkdir -p "$STAGING/$WRAPPER/registry/bin"
348348
cp "$XLBIN" "$STAGING/$WRAPPER/registry/bin/xlings"
@@ -417,7 +417,7 @@ jobs:
417417
- name: Bootstrap mcpp via xlings
418418
env:
419419
XLINGS_NON_INTERACTIVE: '1'
420-
XLINGS_VERSION: '0.4.62'
420+
XLINGS_VERSION: '0.4.67'
421421
run: |
422422
if [ ! -x "$HOME/.xlings/subos/default/bin/xlings" ]; then
423423
WORK=$(mktemp -d)
@@ -599,7 +599,7 @@ jobs:
599599
shell: bash
600600
env:
601601
XLINGS_NON_INTERACTIVE: '1'
602-
XLINGS_VERSION: '0.4.62'
602+
XLINGS_VERSION: '0.4.67'
603603
run: |
604604
WORK=$(mktemp -d)
605605
zipfile="xlings-${XLINGS_VERSION}-windows-x86_64.zip"

0 commit comments

Comments
 (0)