diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 58f25f6..877d952 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -15,9 +15,6 @@ env: jobs: build-and-test: runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-latest-amd64' || 'ubuntu-latest-arm64' }} - concurrency: - group: build-${{ matrix.arch }} - cancel-in-progress: false strategy: matrix: arch: [amd64, arm64] diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 5a58b41..ce601bc 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -26,14 +26,16 @@ WORKDIR /src/p2pool RUN git checkout ${P2POOL_VERSION} -# Determine parallel jobs based on cross-compilation +# Determine parallel jobs based on cross-compilation and architecture RUN mkdir build && cd build && \ if [ "$BUILDPLATFORM" != "$TARGETPLATFORM" ]; then \ MAKE_JOBS="-j2"; \ + elif [ "$TARGETARCH" = "amd64" ]; then \ + MAKE_JOBS="-j$(($(nproc) / 2))"; \ else \ MAKE_JOBS="-j$(nproc)"; \ fi && \ - echo "Building with parallel jobs: $MAKE_JOBS (cross-compile: $([ "$BUILDPLATFORM" != "$TARGETPLATFORM" ] && echo yes || echo no))" && \ + echo "Building with parallel jobs: $MAKE_JOBS (arch: $TARGETARCH, cross-compile: $([ "$BUILDPLATFORM" != "$TARGETPLATFORM" ] && echo yes || echo no))" && \ cmake .. -DCMAKE_BUILD_TYPE=Release -DWITH_MERGE_MINING_DONATION=OFF && \ make $MAKE_JOBS diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 2f6aa2d..7c6bfe0 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -26,14 +26,16 @@ WORKDIR /src/p2pool RUN git checkout ${P2POOL_VERSION} -# Determine parallel jobs based on cross-compilation +# Determine parallel jobs based on cross-compilation and architecture RUN mkdir build && cd build && \ if [ "$BUILDPLATFORM" != "$TARGETPLATFORM" ]; then \ MAKE_JOBS="-j2"; \ + elif [ "$TARGETARCH" = "amd64" ]; then \ + MAKE_JOBS="-j$(($(nproc) / 2))"; \ else \ MAKE_JOBS="-j$(nproc)"; \ fi && \ - echo "Building with parallel jobs: $MAKE_JOBS (cross-compile: $([ "$BUILDPLATFORM" != "$TARGETPLATFORM" ] && echo yes || echo no))" && \ + echo "Building with parallel jobs: $MAKE_JOBS (arch: $TARGETARCH, cross-compile: $([ "$BUILDPLATFORM" != "$TARGETPLATFORM" ] && echo yes || echo no))" && \ cmake .. -DCMAKE_BUILD_TYPE=Release -DWITH_MERGE_MINING_DONATION=OFF && \ make $MAKE_JOBS