Skip to content

Commit 92d09e4

Browse files
committed
ci: bundled xlings pin 0.4.67 -> 0.4.68 (per-repo index artifact); align kXlingsVersion
0.4.68 (openxlings/xlings#377/#379/#380) lets custom index_repos entries declare an artifact source with git fallback — the feature #269 adopts. Older xlings ignores the new fields, so this bump is the benefit switch, not a correctness prerequisite. kXlingsVersion was stale at 0.4.51 with no consumer; align it and print it from `mcpp self env` so the constant can't silently drift again.
1 parent b591a00 commit 92d09e4

5 files changed

Lines changed: 23 additions & 19 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
124124
- name: Bootstrap xlings + released mcpp
125125
run: |
126-
curl -fsSL https://raw.githubusercontent.com/openxlings/xlings/main/tools/other/quick_install.sh | bash -s v0.4.67
126+
curl -fsSL https://raw.githubusercontent.com/openxlings/xlings/main/tools/other/quick_install.sh | bash -s v0.4.68
127127
export PATH="$HOME/.xlings/subos/current/bin:$PATH"
128128
xlings update
129129
xlings install mcpp -y -g

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,17 @@ jobs:
9292
- name: Bootstrap mcpp via xlings
9393
env:
9494
XLINGS_NON_INTERACTIVE: '1'
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
95+
# 0.4.68 (current) — kept in lock-step with the xlings the release
96+
# is built/bundled against (release.yml). 0.4.67 carried the
97+
# multi-index_repo install fix (openxlings/xlings#374); 0.4.68 adds
98+
# per-repo index artifact sources (openxlings/xlings#377) so the
99+
# mcpplibs index syncs via artifact with git as fallback (mcpp#269).
100+
# A past 0.4.61 "download 404
101101
# for mcpp@<pin>" was NOT a version bug — the xlings-res/mcpp GitHub
102102
# release assets were uploaded in a broken state (records present,
103103
# blobs missing → 404 on GET); re-uploaded clean. The stale-INDEX
104104
# half is handled by the marker-clear below.
105-
XLINGS_VERSION: '0.4.67'
105+
XLINGS_VERSION: '0.4.68'
106106
run: |
107107
tarball="xlings-${XLINGS_VERSION}-linux-x86_64.tar.gz"
108108
curl -fsSL -o "/tmp/${tarball}" \
@@ -215,7 +215,7 @@ jobs:
215215
- name: Bootstrap mcpp via xlings
216216
env:
217217
XLINGS_NON_INTERACTIVE: '1'
218-
XLINGS_VERSION: '0.4.67'
218+
XLINGS_VERSION: '0.4.68'
219219
run: |
220220
tarball="xlings-${XLINGS_VERSION}-linux-x86_64.tar.gz"
221221
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.67'
99+
XLINGS_VERSION: '0.4.68'
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.67)
281+
- name: Bootstrap mcpp via xlings (latest 0.4.68)
282282
env:
283283
XLINGS_NON_INTERACTIVE: '1'
284-
XLINGS_VERSION: '0.4.67'
284+
XLINGS_VERSION: '0.4.68'
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.67) so install.sh consumers on aarch64
339+
# Bundle the aarch64 xlings (0.4.68) so install.sh consumers on aarch64
340340
# get an aarch64 xlings, not the x86_64 bootstrap one.
341-
XLA="xlings-0.4.67-linux-aarch64.tar.gz"
341+
XLA="xlings-0.4.68-linux-aarch64.tar.gz"
342342
if curl -fsSL -o "/tmp/$XLA" \
343-
"https://github.com/openxlings/xlings/releases/download/v0.4.67/$XLA"; then
343+
"https://github.com/openxlings/xlings/releases/download/v0.4.68/$XLA"; then
344344
tar -xzf "/tmp/$XLA" -C /tmp
345-
XLBIN=$(find /tmp/xlings-0.4.67-linux-aarch64 -path '*/bin/xlings' -type f | head -1)
345+
XLBIN=$(find /tmp/xlings-0.4.68-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.67'
420+
XLINGS_VERSION: '0.4.68'
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.67'
602+
XLINGS_VERSION: '0.4.68'
603603
run: |
604604
WORK=$(mktemp -d)
605605
zipfile="xlings-${XLINGS_VERSION}-windows-x86_64.zip"

‎src/config.cppm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,7 @@ std::expected<GlobalConfig, ConfigError> load_or_init(
695695
void print_env(const GlobalConfig& cfg) {
696696
std::println("MCPP_HOME = {}", cfg.mcppHome.string());
697697
std::println("xlings binary = {}", cfg.xlingsBinary.string());
698+
std::println("xlings pinned = {}", kXlingsPinnedVersion);
698699
std::println("xlings home = {}", cfg.xlingsHome().string());
699700
std::println("config = {}", cfg.configFile.string());
700701
std::println("BMI cache = {}", cfg.bmiCacheDir.string());

‎src/xlings.cppm‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ struct Env {
3333
namespace pinned {
3434
inline constexpr std::string_view kPatchelfVersion = "0.18.0";
3535
inline constexpr std::string_view kNinjaVersion = "1.12.1";
36-
inline constexpr std::string_view kXlingsVersion = "0.4.51";
36+
// Keep in lock-step with the XLINGS_VERSION pins in release.yml /
37+
// cross-build-test.yml / ci-linux-e2e.yml (the xlings actually bundled
38+
// into releases). Printed by `mcpp self env`.
39+
inline constexpr std::string_view kXlingsVersion = "0.4.68";
3740
inline constexpr std::string_view kNasmVersion = "3.02";
3841
}
3942

0 commit comments

Comments
 (0)