Skip to content

Commit beb040e

Browse files
committed
chore: bump mcpp to 0.0.12 + fix dependency syntax
- .xlings.json: mcpp 0.0.11 → 0.0.12 (install_dir_candidates fix) - mcpp.toml: use bare name `tinyhttps` (default ns is mcpplibs) - CI: clean up debug steps, update cache key to 0.0.12
1 parent 17df796 commit beb040e

3 files changed

Lines changed: 6 additions & 18 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,17 @@ jobs:
2323
"/tmp/xlings-${XLINGS_VERSION}-linux-x86_64/subos/default/bin/xlings" self install
2424
echo "$HOME/.xlings/subos/current/bin" >> "$GITHUB_PATH"
2525
26-
- name: Install workspace tools (.xlings.json → mcpp 0.0.11)
26+
- name: Install workspace tools (.xlings.json → mcpp 0.0.12)
2727
run: xlings install -y
2828

29-
# Cache mcpp's self-bootstrapped sandbox (musl-gcc + binutils +
30-
# glibc + ninja + patchelf, ~800 MB). Toolchain set is pinned by
31-
# mcpp 0.0.11, so a fixed key suffices.
3229
- name: Cache mcpp sandbox
3330
uses: actions/cache@v4
3431
with:
35-
path: ~/.xlings/data/xpkgs/xim-x-mcpp/0.0.11/registry
36-
key: mcpp-sandbox-${{ runner.os }}-mcpp0.0.11-v2
32+
path: ~/.xlings/data/xpkgs/xim-x-mcpp/0.0.12/registry
33+
key: mcpp-sandbox-${{ runner.os }}-mcpp0.0.12
3734

3835
- name: Update package index
3936
run: mcpp index update
4037

4138
- name: Build with mcpp
42-
run: |
43-
mcpp build 2>&1 || {
44-
echo "=== MCPP ENV ==="
45-
mcpp self env 2>&1 || true
46-
echo "=== XPKGS DIR ==="
47-
MCPP_HOME_DIR=$(mcpp self env 2>&1 | grep 'MCPP_HOME' | head -1 | sed 's/.*= *//')
48-
find "$MCPP_HOME_DIR" -path "*/xpkgs/*tinyhttps*" -maxdepth 5 2>/dev/null || echo "not found in MCPP_HOME"
49-
find ~/.xlings -path "*/xpkgs/*tinyhttps*" -maxdepth 5 2>/dev/null || echo "not found in ~/.xlings"
50-
exit 1
51-
}
39+
run: mcpp build

.xlings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"workspace": {
3-
"mcpp": { "linux": "0.0.11" }
3+
"mcpp": { "linux": "0.0.12" }
44
}
55
}

mcpp.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ include_dirs = ["src/json"]
1313
kind = "lib"
1414

1515
[dependencies]
16-
"mcpplibs.tinyhttps" = "0.2.2"
16+
tinyhttps = "0.2.2"

0 commit comments

Comments
 (0)