Skip to content

Commit 9a301d1

Browse files
committed
ci(release): bootstrap/inject xlings 0.4.48 from openxlings
- bump the pinned bootstrap xlings 0.4.30 -> 0.4.48 in all three release jobs (the 0.4.48 release ships owner-anchored shim dispatch, which unblocks shim-resolved tools under a redirected XLINGS_HOME) - download from openxlings/xlings (the active org) instead of d2learn - salt the xlings cache keys so the new bootstrap actually installs instead of being masked by a restored 0.4.30 cache
1 parent 839dfce commit 9a301d1

1 file changed

Lines changed: 12 additions & 15 deletions

File tree

.github/workflows/release.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,23 +87,22 @@ jobs:
8787
uses: actions/cache@v4
8888
with:
8989
path: ~/.xlings
90-
key: xlings-${{ runner.os }}-release-${{ hashFiles('.xlings.json') }}
90+
key: xlings-${{ runner.os }}-release-xl0448-${{ hashFiles('.xlings.json') }}
9191
restore-keys: |
92-
xlings-${{ runner.os }}-release-
93-
xlings-${{ runner.os }}-
92+
xlings-${{ runner.os }}-release-xl0448-
9493
9594
- name: Bootstrap mcpp via xlings
9695
env:
9796
XLINGS_NON_INTERACTIVE: '1'
9897
# Pin xlings to a known-good version. The upstream install
9998
# script always grabs `latest` (no version override), so we
10099
# download + self-install manually to avoid broken releases.
101-
XLINGS_VERSION: '0.4.30'
100+
XLINGS_VERSION: '0.4.48'
102101
run: |
103102
if [ ! -x "$HOME/.xlings/subos/default/bin/xlings" ]; then
104103
tarball="xlings-${XLINGS_VERSION}-linux-x86_64.tar.gz"
105104
curl -fsSL -o "/tmp/${tarball}" \
106-
"https://github.com/d2learn/xlings/releases/download/v${XLINGS_VERSION}/${tarball}"
105+
"https://github.com/openxlings/xlings/releases/download/v${XLINGS_VERSION}/${tarball}"
107106
tar -xzf "/tmp/${tarball}" -C /tmp
108107
"/tmp/xlings-${XLINGS_VERSION}-linux-x86_64/subos/default/bin/xlings" self install
109108
fi
@@ -291,21 +290,20 @@ jobs:
291290
uses: actions/cache@v4
292291
with:
293292
path: ~/.xlings
294-
key: xlings-macos15-release-${{ hashFiles('.xlings.json') }}
293+
key: xlings-macos15-release-xl0448-${{ hashFiles('.xlings.json') }}
295294
restore-keys: |
296-
xlings-macos15-release-
297-
xlings-macos15-arm64-
295+
xlings-macos15-release-xl0448-
298296
299297
- name: Bootstrap mcpp via xlings
300298
env:
301299
XLINGS_NON_INTERACTIVE: '1'
302-
XLINGS_VERSION: '0.4.30'
300+
XLINGS_VERSION: '0.4.48'
303301
run: |
304302
if [ ! -x "$HOME/.xlings/subos/default/bin/xlings" ]; then
305303
WORK=$(mktemp -d)
306304
tarball="xlings-${XLINGS_VERSION}-macosx-arm64.tar.gz"
307305
curl -fsSL -o "${WORK}/${tarball}" \
308-
"https://github.com/d2learn/xlings/releases/download/v${XLINGS_VERSION}/${tarball}"
306+
"https://github.com/openxlings/xlings/releases/download/v${XLINGS_VERSION}/${tarball}"
309307
tar -xzf "${WORK}/${tarball}" -C "${WORK}"
310308
"${WORK}/xlings-${XLINGS_VERSION}-macosx-arm64/subos/default/bin/xlings" self install
311309
fi
@@ -441,21 +439,20 @@ jobs:
441439
uses: actions/cache@v4
442440
with:
443441
path: ~\.xlings
444-
key: xlings-${{ runner.os }}-release-${{ hashFiles('.xlings.json') }}
442+
key: xlings-${{ runner.os }}-release-xl0448-${{ hashFiles('.xlings.json') }}
445443
restore-keys: |
446-
xlings-${{ runner.os }}-release-
447-
xlings-${{ runner.os }}-
444+
xlings-${{ runner.os }}-release-xl0448-
448445
449446
- name: Bootstrap mcpp via xlings
450447
shell: bash
451448
env:
452449
XLINGS_NON_INTERACTIVE: '1'
453-
XLINGS_VERSION: '0.4.30'
450+
XLINGS_VERSION: '0.4.48'
454451
run: |
455452
WORK=$(mktemp -d)
456453
zipfile="xlings-${XLINGS_VERSION}-windows-x86_64.zip"
457454
curl -fsSL -o "${WORK}/${zipfile}" \
458-
"https://github.com/d2learn/xlings/releases/download/v${XLINGS_VERSION}/${zipfile}"
455+
"https://github.com/openxlings/xlings/releases/download/v${XLINGS_VERSION}/${zipfile}"
459456
cd "${WORK}"
460457
unzip -q "${zipfile}"
461458
"$WORK/xlings-${XLINGS_VERSION}-windows-x86_64/subos/default/bin/xlings.exe" self install

0 commit comments

Comments
 (0)