mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-08-20 09:57:10 +00:00
refactor: simplify and update CI pipeline
This commit is contained in:
parent
197bf0033f
commit
bce996a2ef
124
.github/workflows/build-linux.yml
vendored
124
.github/workflows/build-linux.yml
vendored
|
|
@ -1,4 +1,4 @@
|
||||||
name: Build Linux Release
|
name: Build (Linux, x86_64)
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
|
@ -32,26 +32,10 @@ jobs:
|
||||||
- name: Install system dependencies
|
- name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y build-essential python3 python3-pip python3-setuptools libgl1-mesa-dev libglu1-mesa-dev libglfw3-dev libpng-dev pkg-config clang lld ccache libssl-dev
|
sudo apt-get install -y build-essential python3 ninja-build meson libsdl2-dev libgl-dev libglu1-mesa-dev libpthread-stubs0-dev
|
||||||
# Set a reasonable ccache size
|
# Set a reasonable ccache size
|
||||||
ccache -M 5G || true
|
ccache -M 5G || true
|
||||||
|
|
||||||
- name: Setup Python
|
|
||||||
uses: actions/setup-python@v4
|
|
||||||
with:
|
|
||||||
python-version: '3.x'
|
|
||||||
|
|
||||||
- name: Cache pip packages
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: ~/.cache/pip
|
|
||||||
key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/build-linux.yml') }}
|
|
||||||
|
|
||||||
- name: Install Meson and Ninja (pip)
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install meson ninja
|
|
||||||
|
|
||||||
- name: Restore ccache
|
- name: Restore ccache
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
|
|
@ -72,7 +56,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
mkdir -p "$CCACHE_DIR"
|
mkdir -p "$CCACHE_DIR"
|
||||||
export CCACHE_DIR="$CCACHE_DIR"
|
export CCACHE_DIR="$CCACHE_DIR"
|
||||||
meson setup build_meson --wipe --buildtype=release
|
meson setup build_release --wipe --buildtype=release --native-file=./scripts/llvm_native.txt
|
||||||
|
|
||||||
- name: Build with Meson
|
- name: Build with Meson
|
||||||
env:
|
env:
|
||||||
|
|
@ -82,92 +66,16 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
export CCACHE_DIR="${{ runner.temp }}/ccache"
|
export CCACHE_DIR="${{ runner.temp }}/ccache"
|
||||||
# Use all available cores for faster parallel builds
|
# Use all available cores for faster parallel builds
|
||||||
meson compile -C build_meson -j $(nproc) -v Minecraft.Client
|
meson compile -C build_release -j $(nproc) -v Minecraft.Client
|
||||||
|
|
||||||
- name: Install patchelf
|
- name: Install patchelf
|
||||||
run: sudo apt-get install -y patchelf
|
run: sudo apt-get install -y patchelf
|
||||||
|
|
||||||
- name: Bundle executable + libraries
|
|
||||||
env:
|
|
||||||
GITHUB_SHA: ${{ github.sha }}
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
EXE_PATH=build_meson/Minecraft.Client/Minecraft.Client
|
|
||||||
if [ ! -f "$EXE_PATH" ]; then
|
|
||||||
echo "ERROR: expected executable at $EXE_PATH" >&2
|
|
||||||
ls -la build_meson || true
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SHORT_SHA=$(echo "$GITHUB_SHA" | cut -c1-8)
|
|
||||||
BUNDLE=out/minecraft-client-linux-${SHORT_SHA}
|
|
||||||
mkdir -p "$BUNDLE/lib"
|
|
||||||
|
|
||||||
# Copy the binary
|
|
||||||
cp "$EXE_PATH" "$BUNDLE/Minecraft.Client"
|
|
||||||
|
|
||||||
# Collect non-system shared library dependencies and copy them in.
|
|
||||||
# Exclude glibc/libstdc++/libgcc — these are ABI-specific and must
|
|
||||||
# come from the user's system, not from the build runner.
|
|
||||||
ldd "$EXE_PATH" \
|
|
||||||
| awk '/=>/ { print $3 }' \
|
|
||||||
| grep -v '^(' \
|
|
||||||
| grep -Ev '/(libc|libm|libdl|libpthread|librt|libgcc_s|libstdc\+\+|ld-linux)[^/]*\.so' \
|
|
||||||
| sort -u \
|
|
||||||
| while read -r lib; do
|
|
||||||
[ -f "$lib" ] && cp "$lib" "$BUNDLE/lib/" || true
|
|
||||||
done
|
|
||||||
|
|
||||||
# Patch the binary RPATH so it finds libs in ./lib at runtime
|
|
||||||
patchelf --set-rpath '$ORIGIN/lib' "$BUNDLE/Minecraft.Client"
|
|
||||||
|
|
||||||
# Write a launcher script
|
|
||||||
cat > "$BUNDLE/run.sh" << 'RUNEOF'
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
# 4JCraft Linux launcher
|
|
||||||
# -------------------------------------------------------------------
|
|
||||||
# IMPORTANT: Before running, copy the "Common" assets folder from
|
|
||||||
# https://github.com/smartcmd/MinecraftConsoles/releases/tag/nightly
|
|
||||||
# (LCEWindows64.zip → extract → copy "Common" next to this script)
|
|
||||||
# -------------------------------------------------------------------
|
|
||||||
DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
||||||
if [ ! -d "$DIR/Common" ]; then
|
|
||||||
echo "ERROR: Missing 'Common' assets folder."
|
|
||||||
echo "Download LCEWindows64.zip from:"
|
|
||||||
echo " https://github.com/smartcmd/MinecraftConsoles/releases/tag/nightly"
|
|
||||||
echo "Extract it and copy the 'Common' folder next to this run.sh file."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
cd "$DIR"
|
|
||||||
exec ./Minecraft.Client "$@"
|
|
||||||
RUNEOF
|
|
||||||
chmod +x "$BUNDLE/run.sh"
|
|
||||||
|
|
||||||
# Write a README
|
|
||||||
cat > "$BUNDLE/README.txt" << 'EOF'
|
|
||||||
4JCraft Linux Build
|
|
||||||
===================
|
|
||||||
This bundle contains:
|
|
||||||
Minecraft.Client - compiled Linux binary
|
|
||||||
lib/ - all required shared libraries (GL, GLFW, png, zlib, X11 etc.)
|
|
||||||
run.sh - launcher script
|
|
||||||
|
|
||||||
To run:
|
|
||||||
1. Download LCEWindows64.zip from the MinecraftConsoles nightly release:
|
|
||||||
https://github.com/smartcmd/MinecraftConsoles/releases/tag/nightly
|
|
||||||
2. Extract it and copy the "Common" folder into this directory
|
|
||||||
(so you have Common/ sitting next to run.sh)
|
|
||||||
3. Run: ./run.sh [--width W] [--height H] [--fullscreen]
|
|
||||||
EOF
|
|
||||||
|
|
||||||
echo "Bundle ready: $BUNDLE"
|
|
||||||
ls -lh "$BUNDLE" "$BUNDLE/lib"
|
|
||||||
|
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: minecraft-client-linux-${{ github.sha }}
|
name: minecraft-client-linux-release_exe-${{ github.sha }}
|
||||||
path: out/minecraft-client-linux-*/
|
path: build_release/Minecraft.Client/Minecraft.Client
|
||||||
retention-days: 7
|
retention-days: 7
|
||||||
build-linux-debug:
|
build-linux-debug:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
@ -178,26 +86,10 @@ jobs:
|
||||||
- name: Install system dependencies
|
- name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y build-essential python3 python3-pip python3-setuptools libgl1-mesa-dev libglu1-mesa-dev libglfw3-dev libpng-dev pkg-config clang lld ccache libssl-dev
|
sudo apt-get install -y build-essential python3 ninja-build meson libsdl2-dev libgl-dev libglu1-mesa-dev libpthread-stubs0-dev
|
||||||
# Set a reasonable ccache size
|
# Set a reasonable ccache size
|
||||||
ccache -M 5G || true
|
ccache -M 5G || true
|
||||||
|
|
||||||
- name: Setup Python
|
|
||||||
uses: actions/setup-python@v4
|
|
||||||
with:
|
|
||||||
python-version: '3.x'
|
|
||||||
|
|
||||||
- name: Cache pip packages
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: ~/.cache/pip
|
|
||||||
key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/build-linux.yml') }}
|
|
||||||
|
|
||||||
- name: Install Meson and Ninja (pip)
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install meson ninja
|
|
||||||
|
|
||||||
- name: Restore ccache
|
- name: Restore ccache
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
|
|
@ -218,7 +110,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
mkdir -p "$CCACHE_DIR"
|
mkdir -p "$CCACHE_DIR"
|
||||||
export CCACHE_DIR="$CCACHE_DIR"
|
export CCACHE_DIR="$CCACHE_DIR"
|
||||||
meson setup build_debug --wipe --buildtype=debug
|
meson setup build_debug --wipe --buildtype=debug --native-file=./scripts/llvm_native.txt
|
||||||
|
|
||||||
- name: Build Debug with Meson
|
- name: Build Debug with Meson
|
||||||
env:
|
env:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue