diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index d72ab6fd..988d0e9c 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -98,7 +98,7 @@ jobs: - name: Install apt dependencies run: | sudo apt update - sudo apt install git build-essential cmake meson autoconf automake libtool pkg-config ruby bison zlib1g-dev libbz2-dev xorg-dev libgl1-mesa-dev libasound2-dev libpulse-dev -y + sudo apt install git wget build-essential cmake meson autoconf automake libtool pkg-config ruby bison xxd zlib1g-dev libbz2-dev xorg-dev libgl1-mesa-dev libasound2-dev libpulse-dev -y - name: Build everything else run: | @@ -124,7 +124,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: mkxp-z.linux.x86_64.${{github.event_name == 'pull_request' && format('PR{0}', github.event.number) || github.ref_name}}-${{steps.short-sha.outputs.sha}} + name: mkxp-z.linux.ubuntu.22.04.x86_64.${{github.event_name == 'pull_request' && format('PR{0}', github.event.number) || github.ref_name}}-${{steps.short-sha.outputs.sha}} path: build/local build-linux-cross: @@ -162,8 +162,7 @@ jobs: - arch_mkxpz: s390x arch_debian: s390x arch_gcc: s390x-linux-gnu - # src/util/serial-util.h errors on big-endian targets. - experimental: true + experimental: false - arch_mkxpz: riscv64 arch_debian: riscv64 arch_gcc: riscv64-linux-gnu @@ -198,7 +197,7 @@ jobs: echo "deb [arch=${{matrix.arch_debian}}] http://ports.ubuntu.com/ jammy-updates multiverse" | sudo tee -a /etc/apt/sources.list echo "deb [arch=${{matrix.arch_debian}}] http://ports.ubuntu.com/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list sudo apt update - sudo apt install git build-essential cmake meson autoconf automake libtool pkg-config ruby bison -y + sudo apt install git wget build-essential cmake meson autoconf automake libtool pkg-config ruby bison xxd -y sudo apt install libdmx-dev:${{matrix.arch_debian}} libfontenc-dev:${{matrix.arch_debian}} libfs-dev:${{matrix.arch_debian}} libice-dev:${{matrix.arch_debian}} libsm-dev:${{matrix.arch_debian}} libx11-dev:${{matrix.arch_debian}} libxau-dev:${{matrix.arch_debian}} libxaw7-dev:${{matrix.arch_debian}} libxcomposite-dev:${{matrix.arch_debian}} libxcursor-dev:${{matrix.arch_debian}} libxdamage-dev:${{matrix.arch_debian}} libxdmcp-dev:${{matrix.arch_debian}} libxext-dev:${{matrix.arch_debian}} libxfixes-dev:${{matrix.arch_debian}} libxfont-dev:${{matrix.arch_debian}} libxft-dev:${{matrix.arch_debian}} libxi-dev:${{matrix.arch_debian}} libxinerama-dev:${{matrix.arch_debian}} libxkbfile-dev:${{matrix.arch_debian}} libxmu-dev:${{matrix.arch_debian}} libxmuu-dev:${{matrix.arch_debian}} libxpm-dev:${{matrix.arch_debian}} libxrandr-dev:${{matrix.arch_debian}} libxrender-dev:${{matrix.arch_debian}} libxres-dev:${{matrix.arch_debian}} libxss-dev:${{matrix.arch_debian}} libxt-dev:${{matrix.arch_debian}} libxtst-dev:${{matrix.arch_debian}} libxv-dev:${{matrix.arch_debian}} libxvmc-dev:${{matrix.arch_debian}} libxxf86dga-dev:${{matrix.arch_debian}} libxxf86vm-dev:${{matrix.arch_debian}} x11proto-dev:${{matrix.arch_debian}} xserver-xorg-dev:${{matrix.arch_debian}} xtrans-dev:${{matrix.arch_debian}} -y sudo apt install gcc-${{matrix.arch_gcc}} g++-${{matrix.arch_gcc}} zlib1g-dev:${{matrix.arch_debian}} libbz2-dev:${{matrix.arch_debian}} libgl1-mesa-dev:${{matrix.arch_debian}} libasound2-dev:${{matrix.arch_debian}} libpulse-dev:${{matrix.arch_debian}} -y @@ -230,7 +229,62 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: mkxp-z.linux.${{matrix.arch_mkxpz}}.${{github.event_name == 'pull_request' && format('PR{0}', github.event.number) || github.ref_name}}-${{steps.short-sha.outputs.sha}} + name: mkxp-z.linux.ubuntu.22.04.${{matrix.arch_mkxpz}}.${{github.event_name == 'pull_request' && format('PR{0}', github.event.number) || github.ref_name}}-${{steps.short-sha.outputs.sha}} + path: build/local + + build-linux-native-container: + name: Debian Trixie x86_64 + runs-on: ubuntu-22.04 + container: debian:trixie + defaults: + run: + shell: bash + steps: + - uses: benjlevesque/short-sha@v2.2 + id: short-sha + with: + length: 7 + + - name: Checkout repository + uses: actions/checkout@v4 + + - uses: actions/cache@v4 + with: + path: | + linux/build-x86_64 + linux/downloads + key: lin-debian-trixie-x86_64-${{ hashFiles('linux/Makefile') }} + + - name: Install apt dependencies + run: | + apt update + apt install git wget build-essential cmake meson autoconf automake libtool pkg-config ruby bison xxd zlib1g-dev libbz2-dev xorg-dev libgl1-mesa-dev libasound2-dev libpulse-dev -y + + - name: Build everything else + run: | + cd linux + make + + - name: Build executable + run: | + source linux/vars.sh + meson setup build --bindir=. --prefix=$GITHUB_WORKSPACE/build/local + cd build + ninja + ninja install + + - name: Prepare archive + run: | + cd build/local + cp -r ../../linux/build-x86_64/lib/ruby/3.1.0 . + mv ./3.1.0 ./stdlib + cp ../../mkxp.json . + cp -r ../../scripts . + cp ../../assets/LICENSE.mkxp-z-with-https.txt . + + - uses: actions/upload-artifact@v4 + with: + name: mkxp-z.linux.debian.trixie.x86_64.${{github.event_name == 'pull_request' && format('PR{0}', github.event.number) || github.ref_name}}-${{steps.short-sha.outputs.sha}} path: build/local build-macos: