From 8affad428ebe97c4d52f645ced14533bf6adb4be Mon Sep 17 00:00:00 2001 From: Stanislav Pastushenko Date: Thu, 11 Dec 2025 21:28:15 +0100 Subject: [PATCH] fix build --- .gitea/workflows/build.yml | 10 ++-------- docker/build-linux-image.sh | 2 +- docker/linux-build.Dockerfile | 13 +------------ 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index c00d7e2..751d49a 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -18,19 +18,13 @@ jobs: matrix: include: - platform: linux - docker_image: gitea.staspast.click/stas/rust-node-builder:v4 + docker_image: gitea.staspast.click/stas/rust-node-builder:v5 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:v4 - target: x86_64-apple-darwin - artifact_name: rlogg-macos-x86_64 - binary_extension: "" - setup_cmd: "" - platform: windows - docker_image: gitea.staspast.click/stas/rust-node-builder:v3 + docker_image: gitea.staspast.click/stas/rust-node-builder:v5 target: x86_64-pc-windows-gnu artifact_name: rlogg-windows-x86_64 binary_extension: ".exe" diff --git a/docker/build-linux-image.sh b/docker/build-linux-image.sh index 9560654..48b2175 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:v4 -f linux-build.Dockerfile . && docker push gitea.staspast.click/stas/rust-node-builder:v4 \ No newline at end of file +docker build -t gitea.staspast.click/stas/rust-node-builder:v5 -f linux-build.Dockerfile . && docker push gitea.staspast.click/stas/rust-node-builder:v5 \ No newline at end of file diff --git a/docker/linux-build.Dockerfile b/docker/linux-build.Dockerfile index a10a966..d418916 100644 --- a/docker/linux-build.Dockerfile +++ b/docker/linux-build.Dockerfile @@ -8,7 +8,6 @@ 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 @@ -24,14 +23,4 @@ RUN SCCACHE_VERSION=0.7.4 && \ curl -L "$SCCACHE_URL" | tar xz && \ chmod +x sccache-v${SCCACHE_VERSION}-x86_64-unknown-linux-musl/sccache && \ 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 + rm -rf sccache-v${SCCACHE_VERSION}-x86_64-unknown-linux-musl \ No newline at end of file