Skip to content

Commit dd54205

Browse files
authored
ci: switch release workflow to github runners (#2346)
1 parent f8489b8 commit dd54205

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/release-docker-image.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ jobs:
3333
build-image:
3434
name: Build ${{ matrix.platform }} image
3535
runs-on: ${{ matrix.runner }}
36-
timeout-minutes: 25
36+
timeout-minutes: 180
3737
strategy:
3838
matrix:
3939
include:
40-
- runner: ["self-hosted", "linux", "x64", "ubuntu-platform"]
40+
- runner: ubuntu-24.04
4141
platform: linux/amd64
42-
- runner: ["self-hosted", "linux", "arm64", "ubuntu-platform"]
42+
- runner: ubuntu-24.04
4343
platform: linux/arm64
4444
steps:
4545
- name: Check out repo
@@ -54,6 +54,10 @@ jobs:
5454
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
5555
aws-region: ${{ secrets.AWS_REGION }}
5656

57+
- name: Set up QEMU
58+
uses: docker/setup-qemu-action@v3
59+
if: ${{ matrix.platform == 'linux/arm64' }}
60+
5761
- name: Build and push by digest
5862
uses: ./.github/actions/docker
5963
id: docker_build
@@ -134,6 +138,7 @@ jobs:
134138
with:
135139
username: ${{ secrets.DOCKERHUB_USERNAME }}
136140
password: ${{ secrets.DOCKERHUB_TOKEN }}
141+
137142
- name: Create manifest list and push
138143
working-directory: ${{ env.DIGEST_DIR_PATH }}
139144
run: |

Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,7 @@ COPY --parents \
318318
packages/check-features \
319319
/platform/
320320

321-
RUN if [[ "${CARGO_BUILD_PROFILE}" == "release" ]] ; then \
322-
export RELEASE="--release" ; \
323-
fi && \
324-
source $HOME/.cargo/env && \
321+
RUN source $HOME/.cargo/env && \
325322
source /root/env && \
326323
cargo chef prepare $RELEASE --recipe-path recipe.json
327324

@@ -335,7 +332,7 @@ SHELL ["/bin/bash", "-o", "pipefail","-e", "-x", "-c"]
335332

336333
WORKDIR /platform
337334

338-
COPY --from=build-planner /platform/recipe.json /platform/.cargo /platform/
335+
COPY --from=build-planner --parents /platform/recipe.json /platform/.cargo /
339336

340337
# Build dependencies - this is the caching Docker layer!
341338
RUN --mount=type=cache,sharing=shared,id=cargo_registry_index,target=${CARGO_HOME}/registry/index \

0 commit comments

Comments
 (0)