@@ -315,22 +315,17 @@ jobs:
315315 LLVM_ROOT=$(find "$HOME/.xlings" -path "*/xpkgs/xim-x-llvm/*/bin/clang++" | head -1 | xargs dirname | xargs dirname)
316316 echo "LLVM_ROOT=$LLVM_ROOT" >> "$GITHUB_ENV"
317317
318- - name : Install xmake (for bootstrap)
319- run : brew install xmake
320-
321- - name : Bootstrap-compile mcpp (xmake + LLVM)
318+ - name : Install mcpp@0.0.16 via xlings
322319 run : |
323- export LLVM_ROOT ="$LLVM_ROOT "
324- bash scripts/bootstrap-macos.sh "$LLVM_ROOT"
325- ./target/bootstrap/bin/ mcpp --version
320+ export PATH ="$HOME/.xlings/subos/default/bin:$PATH "
321+ xlings install mcpp -y
322+ mcpp --version
326323
327- - name : Self-host rebuild ( mcpp builds mcpp )
324+ - name : Build mcpp (self-host )
328325 run : |
329- # Put bootstrapped mcpp on PATH so build.ninja can find it for dyndep
330- export PATH="$PWD/target/bootstrap/bin:$PATH"
326+ export PATH="$HOME/.xlings/subos/default/bin:$PATH"
331327 mcpp build
332- # Find the self-hosted binary
333- SELFHOST=$(find target -path "*/bin/mcpp" -not -path "*/bootstrap/*" -not -path "*/build/*" | head -1)
328+ SELFHOST=$(find target -path "*/bin/mcpp" | head -1)
334329 test -x "$SELFHOST"
335330 "$SELFHOST" --version
336331 echo "SELFHOST=$SELFHOST" >> "$GITHUB_ENV"
@@ -339,8 +334,8 @@ jobs:
339334 id : stage
340335 run : |
341336 VERSION="${{ steps.resolve.outputs.version }}"
342- TARBALL_NAME="mcpp-${VERSION}-darwin -arm64.tar.gz"
343- WRAPPER="mcpp-${VERSION}-darwin -arm64"
337+ TARBALL_NAME="mcpp-${VERSION}-macosx -arm64.tar.gz"
338+ WRAPPER="mcpp-${VERSION}-macosx -arm64"
344339
345340 # Create release layout
346341 STAGING=$(mktemp -d)
@@ -371,10 +366,10 @@ jobs:
371366 mkdir -p dist
372367 (cd "$STAGING" && tar -czf "$GITHUB_WORKSPACE/dist/${TARBALL_NAME}" "$WRAPPER")
373368 # Versionless alias
374- cp "dist/${TARBALL_NAME}" "dist/mcpp-darwin -arm64.tar.gz"
369+ cp "dist/${TARBALL_NAME}" "dist/mcpp-macosx -arm64.tar.gz"
375370 # SHA256
376371 (cd dist && shasum -a 256 "${TARBALL_NAME}" > "${TARBALL_NAME}.sha256")
377- (cd dist && shasum -a 256 "mcpp-darwin -arm64.tar.gz" > "mcpp-darwin -arm64.tar.gz.sha256")
372+ (cd dist && shasum -a 256 "mcpp-macosx -arm64.tar.gz" > "mcpp-macosx -arm64.tar.gz.sha256")
378373
379374 echo "tarball=${TARBALL_NAME}" >> "$GITHUB_OUTPUT"
380375 ls -la dist/
@@ -394,7 +389,7 @@ jobs:
394389 with :
395390 tag_name : ${{ steps.resolve.outputs.tag }}
396391 files : |
397- dist/mcpp-${{ steps.resolve.outputs.version }}-darwin -arm64.tar.gz
398- dist/mcpp-${{ steps.resolve.outputs.version }}-darwin -arm64.tar.gz.sha256
399- dist/mcpp-darwin -arm64.tar.gz
400- dist/mcpp-darwin -arm64.tar.gz.sha256
392+ dist/mcpp-${{ steps.resolve.outputs.version }}-macosx -arm64.tar.gz
393+ dist/mcpp-${{ steps.resolve.outputs.version }}-macosx -arm64.tar.gz.sha256
394+ dist/mcpp-macosx -arm64.tar.gz
395+ dist/mcpp-macosx -arm64.tar.gz.sha256
0 commit comments