diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index ce9a9f67f..27bd128df 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -51,12 +51,12 @@ jobs: - name: Configure Meson env: - CC: "ccache clang-20" - CXX: "ccache clang++-20" + CC: "ccache clang" + CXX: "ccache clang++" CC_LD: lld CXX_LD: lld run: | - meson setup build --wipe + meson setup build --native-file=scripts/llvm_native.txt --wipe - name: Build with Meson env: diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index 921b74925..ad54cec53 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -1,4 +1,4 @@ -name: Nightly (Linux, x86-64) +name: Release Nightly (Linux, x86-64) on: push: @@ -14,11 +14,11 @@ on: - '**.inl' - "**meson.build" - "flake.nix" - - '.github/workflows/build-linux.yml' + - '.github/workflows/release-linux.yml' workflow_dispatch: jobs: - build-linux: + release-linux: runs-on: ubuntu-latest steps: @@ -30,34 +30,32 @@ jobs: sudo apt-get update sudo apt-get install -y build-essential ccache python3 python3-pip ninja-build libsdl2-dev libgl-dev libglu1-mesa-dev libpthread-stubs0-dev libglm-dev python -m pip install meson + # Set a reasonable ccache size ccache -M 5G || true - - name: Restore ccache - uses: actions/cache@v4 - with: - path: ~/.ccache - key: ${{ runner.os }}-ccache-${{ hashFiles('**/meson.build') }} + - name: Install LLVM + libc++ + run: | + wget -qO- https://apt.llvm.org/llvm.sh | sudo bash -s -- 20 + sudo apt-get install -y libc++-20-dev libc++abi-20-dev - - name: Restore meson cache - uses: actions/cache@v4 + - name: Restore ccache + uses: actions/cache@v5 with: - path: ~/.cache/meson - key: ${{ runner.os }}-meson-${{ hashFiles('**/meson.build') }} + path: ${{ runner.temp }}/ccache + key: ${{ runner.os }}-ccache-${{ hashFiles('**/meson.build') }} + restore-keys: ${{ runner.os }}-ccache- - name: Configure Meson env: - CC: "ccache clang-20" - CXX: "ccache clang++-20" - CCACHE_DIR: ${{ runner.temp }}/ccache + CC: "ccache clang" + CXX: "ccache clang++" + CC_LD: lld + CXX_LD: lld run: | - mkdir -p "$CCACHE_DIR" - export CCACHE_DIR="$CCACHE_DIR" - meson setup build --wipe --native-file=./scripts/llvm_native.txt + meson setup build --native-file=scripts/llvm_native.txt --wipe - name: Build with Meson env: - CC: "ccache clang-20" - CXX: "ccache clang++-20" CCACHE_DIR: ${{ runner.temp }}/ccache run: | export CCACHE_DIR="${{ runner.temp }}/ccache" @@ -68,8 +66,8 @@ jobs: - name: Package artifact run: | - cd build - zip -r ../minecraft-client-linux.zip Minecraft.Client --exclude "Minecraft.Client/Minecraft.Client.p/*" + cd build/targets + zip -r ../minecraft-client-linux.zip app --exclude "app/Minecraft.Client.p/*" - name: Upload artifact uses: actions/upload-artifact@v4