From ef132c35f386a3bdb62b3a1da74ec6e3fdac4f96 Mon Sep 17 00:00:00 2001 From: Stanislav Pastushenko Date: Thu, 11 Dec 2025 21:16:55 +0100 Subject: [PATCH] fix build --- .gitea/workflows/build.yml | 6 ++++-- docker/build-linux-image.sh | 2 +- docker/linux-build.Dockerfile | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 3046709..c00d7e2 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -12,17 +12,19 @@ jobs: runs-on: gitea-runner container: image: ${{ matrix.docker_image }} + volumes: + - /tmp/gitea-sccache:/tmp/sccache strategy: matrix: include: - platform: linux - docker_image: gitea.staspast.click/stas/rust-node-builder:v2 + docker_image: gitea.staspast.click/stas/rust-node-builder:v4 target: x86_64-unknown-linux-gnu artifact_name: rlogg-linux-x86_64 binary_extension: "" setup_cmd: "" - platform: macos - docker_image: gitea.staspast.click/stas/rust-node-builder:v2 + docker_image: gitea.staspast.click/stas/rust-node-builder:v4 target: x86_64-apple-darwin artifact_name: rlogg-macos-x86_64 binary_extension: "" diff --git a/docker/build-linux-image.sh b/docker/build-linux-image.sh index 7f8f7bc..9560654 100755 --- a/docker/build-linux-image.sh +++ b/docker/build-linux-image.sh @@ -1 +1 @@ -docker build -t gitea.staspast.click/stas/rust-node-builder:v3 -f linux-build.Dockerfile . && docker push gitea.staspast.click/stas/rust-node-builder:v3 \ No newline at end of file +docker build -t gitea.staspast.click/stas/rust-node-builder:v4 -f linux-build.Dockerfile . && docker push gitea.staspast.click/stas/rust-node-builder:v4 \ No newline at end of file diff --git a/docker/linux-build.Dockerfile b/docker/linux-build.Dockerfile index 436a88a..a10a966 100644 --- a/docker/linux-build.Dockerfile +++ b/docker/linux-build.Dockerfile @@ -8,6 +8,7 @@ RUN apt-get update && \ tar \ gzip \ curl \ + xz-utils \ mingw-w64 \ && rm -rf /var/lib/apt/lists/* && \ # Check if /bin/tar is BusyBox and replace it with GNU tar @@ -25,6 +26,12 @@ RUN SCCACHE_VERSION=0.7.4 && \ mv sccache-v${SCCACHE_VERSION}-x86_64-unknown-linux-musl/sccache /usr/local/bin/ && \ rm -rf sccache-v${SCCACHE_VERSION}-x86_64-unknown-linux-musl +# Install Zig compiler (required for cargo-zigbuild) +RUN ZIG_VERSION=0.11.0 && \ + curl -L "https://ziglang.org/download/${ZIG_VERSION}/zig-linux-x86_64-${ZIG_VERSION}.tar.xz" | tar xJ && \ + mv zig-linux-x86_64-${ZIG_VERSION} /usr/local/zig && \ + ln -s /usr/local/zig/zig /usr/local/bin/zig + # Install cargo-zigbuild for cross-compilation (macOS targets) RUN cargo install cargo-zigbuild && \ rm -rf /usr/local/cargo/registry \ No newline at end of file