From 0e8e493447875620d89b6e8153a35d76c70ce6f9 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 14:45:09 +0100 Subject: [PATCH 01/46] Build the Docker image for `arm64` as well --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4edb9324a2..0b7178e92f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,6 +47,7 @@ jobs: - uses: docker/build-push-action@v5.1.0 with: context: . + platforms: linux/amd64,linux/arm64 file: ./full-node/Dockerfile load: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} tags: ghcr.io/smol-dot/full-node:main From 2f9d1549ebe3408b3683bcedaf326458b3fd5f83 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 15:26:21 +0100 Subject: [PATCH 02/46] Work in progress --- .github/workflows/deploy.yml | 46 ++++++++++++++++++++++++++++-------- full-node/Dockerfile | 10 ++++---- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0b7178e92f..a18b414829 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -28,15 +28,46 @@ on: permissions: read-all jobs: - build-push-docker-image: + build-docker-image: runs-on: ubuntu-latest permissions: contents: read - packages: write + strategy: + matrix: + platform: [linux/amd64, linux/arm64] steps: - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - uses: actions/checkout@v4 + with: + path: repo + - uses: docker/build-push-action@v5.1.0 + with: + context: ./repo + platforms: ${{ matrix.platform }} + build-args: | + TARGET= + file: ./repo/full-node/Dockerfile + output: type=docker,dest=./image.tar + - uses: actions/upload-artifact@v4 + with: + name: docker-image-${{ matrix.platform }} + path: ./image.tar + if-no-files-found: error + retention-days: 1 + + push-docker-image: + runs-on: ubuntu-latest + needs: + build-docker-image + permissions: + contents: read + packages: write + steps: + - uses: actions/download-artifact@v4 + with: + path: . + - uses: docker/setup-buildx-action@v3 - uses: docker/login-action@v3 # This `if` adds an additional safety against accidental pushes. if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} @@ -44,13 +75,8 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v5.1.0 - with: - context: . - platforms: linux/amd64,linux/arm64 - file: ./full-node/Dockerfile - load: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} - tags: ghcr.io/smol-dot/full-node:main + - run: | + docker buildx imagetools create -t ghcr.io/smol-dot/full-node:main TODO unfinished here - run: docker push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} @@ -272,7 +298,7 @@ jobs: all-deploy: # This dummy job depends on all the mandatory checks. It succeeds if and only if CI is # considered successful. - needs: [build-push-docker-image, docs-publish, npm-publish, deno-publish, crates-io-publish] + needs: [push-docker-image, docs-publish, npm-publish, deno-publish, crates-io-publish] runs-on: ubuntu-latest steps: - run: echo Success diff --git a/full-node/Dockerfile b/full-node/Dockerfile index 1d09ec6077..a727766dbe 100644 --- a/full-node/Dockerfile +++ b/full-node/Dockerfile @@ -1,17 +1,19 @@ -FROM rust:1 AS builder +FROM --platform=$BUILDPLATFORM rust:1 AS builder LABEL maintainer "Pierre Krieger " +ARG TARGET + COPY ./.. /build WORKDIR /build RUN apt-get update && apt-get install -y musl-tools -RUN rustup target add x86_64-unknown-linux-musl -RUN cargo build --target x86_64-unknown-linux-musl --package smoldot-full-node --release --verbose +RUN rustup target add $TARGET +RUN cargo build --target $TARGET --package smoldot-full-node --release --verbose FROM alpine:latest LABEL maintainer "Pierre Krieger " -COPY --from=builder /build/target/x86_64-unknown-linux-musl/release/full-node /usr/local/bin +COPY --from=builder /build/target/$TARGET/release/full-node /usr/local/bin EXPOSE 30333 ENTRYPOINT ["/usr/local/bin/full-node"] From 44753ba65c4a08d70c9d6da839b25b1ea47c5e80 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 15:27:40 +0100 Subject: [PATCH 03/46] Fix target --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a18b414829..1fe9334303 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -46,7 +46,7 @@ jobs: context: ./repo platforms: ${{ matrix.platform }} build-args: | - TARGET= + TARGET=${{ matrix.platform == 'linux/amd64' && 'x86_64-unknown-linux-musl' || 'aarch64-unknown-linux-musl' }} file: ./repo/full-node/Dockerfile output: type=docker,dest=./image.tar - uses: actions/upload-artifact@v4 From bea5cac1132f128814cbbaa5af2da41fb8dd6ba0 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 15:32:03 +0100 Subject: [PATCH 04/46] Don't set the build platform --- full-node/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/full-node/Dockerfile b/full-node/Dockerfile index a727766dbe..c3db42a65d 100644 --- a/full-node/Dockerfile +++ b/full-node/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM rust:1 AS builder +FROM rust:1 AS builder LABEL maintainer "Pierre Krieger " ARG TARGET From bae9250e03270056085f8f682e9ce5e75dbddee8 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 15:34:03 +0100 Subject: [PATCH 05/46] Import docker images --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1fe9334303..8415178ef3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -68,6 +68,8 @@ jobs: with: path: . - uses: docker/setup-buildx-action@v3 + - run: | + for i in */*.tar; do cmd "docker import $i"; done - uses: docker/login-action@v3 # This `if` adds an additional safety against accidental pushes. if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 305b1bdf07138d67cde0a7b0617f4766ff42f248 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 15:38:38 +0100 Subject: [PATCH 06/46] Fix ARG going out of scope --- full-node/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/full-node/Dockerfile b/full-node/Dockerfile index c3db42a65d..4283e8aa88 100644 --- a/full-node/Dockerfile +++ b/full-node/Dockerfile @@ -13,6 +13,8 @@ RUN cargo build --target $TARGET --package smoldot-full-node --release --verbose FROM alpine:latest LABEL maintainer "Pierre Krieger " +ARG TARGET + COPY --from=builder /build/target/$TARGET/release/full-node /usr/local/bin EXPOSE 30333 From fd7bf5ca6ecf7d6afb62e566a234064a1a27eb05 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 15:40:35 +0100 Subject: [PATCH 07/46] Don't use ARG in the second stage, actually --- full-node/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/full-node/Dockerfile b/full-node/Dockerfile index 4283e8aa88..9818463294 100644 --- a/full-node/Dockerfile +++ b/full-node/Dockerfile @@ -9,13 +9,13 @@ WORKDIR /build RUN apt-get update && apt-get install -y musl-tools RUN rustup target add $TARGET RUN cargo build --target $TARGET --package smoldot-full-node --release --verbose +RUN mv ./target/$TARGET/release/full-node ./full-node FROM alpine:latest LABEL maintainer "Pierre Krieger " -ARG TARGET -COPY --from=builder /build/target/$TARGET/release/full-node /usr/local/bin +COPY --from=builder /build/full-node /usr/local/bin EXPOSE 30333 ENTRYPOINT ["/usr/local/bin/full-node"] From 73e3540e37459a5ed7c3425a56b3a12b4605edf5 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 15:42:29 +0100 Subject: [PATCH 08/46] Try to make it work --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8415178ef3..b3685d626b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -78,7 +78,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - run: | - docker buildx imagetools create -t ghcr.io/smol-dot/full-node:main TODO unfinished here + docker buildx imagetools create -t ghcr.io/smol-dot/full-node:main $(docker images -q) - run: docker push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From cd3d2c8cab14a88f760002cb23a7ed0b40e923e7 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 15:44:28 +0100 Subject: [PATCH 09/46] Why the hell does a typo trigger only a warning and not an error --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b3685d626b..2788e166e8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -48,7 +48,7 @@ jobs: build-args: | TARGET=${{ matrix.platform == 'linux/amd64' && 'x86_64-unknown-linux-musl' || 'aarch64-unknown-linux-musl' }} file: ./repo/full-node/Dockerfile - output: type=docker,dest=./image.tar + outputs: type=docker,dest=./image.tar - uses: actions/upload-artifact@v4 with: name: docker-image-${{ matrix.platform }} From 17b8a5d500b11f7d076dbc2294b1634b4b76ef38 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 15:53:46 +0100 Subject: [PATCH 10/46] Forbidden characters in artifact name --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2788e166e8..b9c0d113d8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -51,7 +51,7 @@ jobs: outputs: type=docker,dest=./image.tar - uses: actions/upload-artifact@v4 with: - name: docker-image-${{ matrix.platform }} + name: docker-image-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }} path: ./image.tar if-no-files-found: error retention-days: 1 From 585dbf8aa488302026b51ae700e117e37bd4bf90 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 16:14:55 +0100 Subject: [PATCH 11/46] Try compiling for -gnu --- .github/workflows/deploy.yml | 2 +- full-node/Dockerfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b9c0d113d8..0fb8d2a4b5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -46,7 +46,7 @@ jobs: context: ./repo platforms: ${{ matrix.platform }} build-args: | - TARGET=${{ matrix.platform == 'linux/amd64' && 'x86_64-unknown-linux-musl' || 'aarch64-unknown-linux-musl' }} + TARGET=${{ matrix.platform == 'linux/amd64' && 'x86_64-unknown-linux-gnu' || 'aarch64-unknown-linux-gnu' }} file: ./repo/full-node/Dockerfile outputs: type=docker,dest=./image.tar - uses: actions/upload-artifact@v4 diff --git a/full-node/Dockerfile b/full-node/Dockerfile index 9818463294..9d84367955 100644 --- a/full-node/Dockerfile +++ b/full-node/Dockerfile @@ -6,7 +6,6 @@ ARG TARGET COPY ./.. /build WORKDIR /build -RUN apt-get update && apt-get install -y musl-tools RUN rustup target add $TARGET RUN cargo build --target $TARGET --package smoldot-full-node --release --verbose RUN mv ./target/$TARGET/release/full-node ./full-node From 9f5eec3e9398cdca9a0a22c8a839156be0225c5f Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 16:52:59 +0100 Subject: [PATCH 12/46] Try compile for arm64 on an arm64 machine --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0fb8d2a4b5..ad52ee1539 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -29,12 +29,12 @@ permissions: read-all jobs: build-docker-image: - runs-on: ubuntu-latest - permissions: - contents: read strategy: matrix: platform: [linux/amd64, linux/arm64] + runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || 'macos-latest-xlarge' }} + permissions: + contents: read steps: - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 From 86b5086976ee09c5f60d4b97ee2da6fd395cbe03 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 16:53:22 +0100 Subject: [PATCH 13/46] Remove unnecessary permission --- .github/workflows/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ad52ee1539..ecea16cd87 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -61,7 +61,6 @@ jobs: needs: build-docker-image permissions: - contents: read packages: write steps: - uses: actions/download-artifact@v4 From 32136638257c18e0bfe3b7c6b1208fc9a766b1ef Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 17:15:13 +0100 Subject: [PATCH 14/46] Try use just macos-latest to see if it works --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ecea16cd87..ffef5ec0ff 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,7 +32,7 @@ jobs: strategy: matrix: platform: [linux/amd64, linux/arm64] - runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || 'macos-latest-xlarge' }} + runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || 'macos-latest' }} permissions: contents: read steps: From f1d4692502f6cad6d67cd720a8ca5f2e6bd92300 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 17:16:36 +0100 Subject: [PATCH 15/46] Add TODO --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ffef5ec0ff..4a942f2cb7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,7 +32,7 @@ jobs: strategy: matrix: platform: [linux/amd64, linux/arm64] - runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || 'macos-latest' }} + runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || 'macos-latest' }} # TODO: use an arm64 platform for arm64 ; right now we use macos-latest, but it's not actually arm64 permissions: contents: read steps: From c561a077ff693b9252184dd9adb5934f43aa7e98 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 17:26:17 +0100 Subject: [PATCH 16/46] Change command to import images --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4a942f2cb7..b950e38e54 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -68,7 +68,7 @@ jobs: path: . - uses: docker/setup-buildx-action@v3 - run: | - for i in */*.tar; do cmd "docker import $i"; done + ls -1 */*.tar | xargs docker import - uses: docker/login-action@v3 # This `if` adds an additional safety against accidental pushes. if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From a67f10b350147dce837d84107c9448292f3ca24b Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 17:31:50 +0100 Subject: [PATCH 17/46] Revert to ubuntu-latest --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b950e38e54..70157f1a49 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,7 +32,7 @@ jobs: strategy: matrix: platform: [linux/amd64, linux/arm64] - runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || 'macos-latest' }} # TODO: use an arm64 platform for arm64 ; right now we use macos-latest, but it's not actually arm64 + runs-on: ubuntu-latest permissions: contents: read steps: From 19d2de4081153033f7725522166324e8e14d2451 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 19:07:03 +0100 Subject: [PATCH 18/46] Fix missing permission --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 70157f1a49..2e2d701f42 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -61,6 +61,7 @@ jobs: needs: build-docker-image permissions: + contents: read packages: write steps: - uses: actions/download-artifact@v4 From 5b8723b65fac2c9bdc1d74bb51503486f216ba30 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 3 Jan 2024 22:09:51 +0100 Subject: [PATCH 19/46] Tweaks --- .github/workflows/deploy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2e2d701f42..2a5c045073 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -77,8 +77,10 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - run: docker -images # TODO remove - run: | - docker buildx imagetools create -t ghcr.io/smol-dot/full-node:main $(docker images -q) + docker buildx imagetools create --dry-run -t ghcr.io/smol-dot/full-node:main $(docker images -q) + - run: docker -images # TODO remove - run: docker push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From c64a99f4ad2112b9f8bdd39b858fff42054af140 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 4 Jan 2024 10:03:15 +0100 Subject: [PATCH 20/46] Wasted an hour of CPU for a typo --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2a5c045073..c2bce9af4e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -77,10 +77,10 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - run: docker -images # TODO remove + - run: docker images # TODO remove - run: | docker buildx imagetools create --dry-run -t ghcr.io/smol-dot/full-node:main $(docker images -q) - - run: docker -images # TODO remove + - run: docker images # TODO remove - run: docker push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 3c1ae5d43fbd96b2ff025d80af18a37074ce27ca Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 4 Jan 2024 10:12:45 +0100 Subject: [PATCH 21/46] Line-separated images list --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c2bce9af4e..766a2b2241 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -79,7 +79,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - run: docker images # TODO remove - run: | - docker buildx imagetools create --dry-run -t ghcr.io/smol-dot/full-node:main $(docker images -q) + docker buildx imagetools create --dry-run -t ghcr.io/smol-dot/full-node:main $(docker images --no-trunc -q | tr "\n" " ") - run: docker images # TODO remove - run: docker push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 664ac2d97e3ef8b1ff429693800bd19b26bb9f9b Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 4 Jan 2024 13:01:29 +0100 Subject: [PATCH 22/46] Adds tags to the relevant images --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 766a2b2241..7ca329ae2f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -69,7 +69,7 @@ jobs: path: . - uses: docker/setup-buildx-action@v3 - run: | - ls -1 */*.tar | xargs docker import + ls -1 */*.tar | xargs -I {} docker import {} ghcr.io/smol-dot/full-node - uses: docker/login-action@v3 # This `if` adds an additional safety against accidental pushes. if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 5dd8c5b6e62e4140e99b3059ee45465966b64bc5 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 4 Jan 2024 14:12:44 +0100 Subject: [PATCH 23/46] Some tweaks that won't work --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7ca329ae2f..095efe6a11 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -78,8 +78,9 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - run: docker images # TODO remove + - run: docker images --no-trunc -q ghcr.io/smol-dot/full-node | tr "\n" " " # TODO: remove - run: | - docker buildx imagetools create --dry-run -t ghcr.io/smol-dot/full-node:main $(docker images --no-trunc -q | tr "\n" " ") + docker buildx imagetools create --dry-run -t ghcr.io/smol-dot/full-node:main $(docker images --no-trunc -q ghcr.io/smol-dot/full-node | tr "\n" " ") - run: docker images # TODO remove - run: docker push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 3f65b04a257d0c06cd4ebbfe1a1008ac5aaaeeeb Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 4 Jan 2024 14:18:06 +0100 Subject: [PATCH 24/46] Change approach --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 095efe6a11..9989562564 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -48,6 +48,7 @@ jobs: build-args: | TARGET=${{ matrix.platform == 'linux/amd64' && 'x86_64-unknown-linux-gnu' || 'aarch64-unknown-linux-gnu' }} file: ./repo/full-node/Dockerfile + tags: ghcr.io/smol-dot/full-node:${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }} outputs: type=docker,dest=./image.tar - uses: actions/upload-artifact@v4 with: @@ -69,7 +70,7 @@ jobs: path: . - uses: docker/setup-buildx-action@v3 - run: | - ls -1 */*.tar | xargs -I {} docker import {} ghcr.io/smol-dot/full-node + ls -1 */*.tar | xargs docker load - uses: docker/login-action@v3 # This `if` adds an additional safety against accidental pushes. if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 5df1bd8cfa10c1b3da2fc14b833b2480d5ae8100 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 4 Jan 2024 15:26:25 +0100 Subject: [PATCH 25/46] Another typo --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9989562564..9772b26b59 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -70,7 +70,7 @@ jobs: path: . - uses: docker/setup-buildx-action@v3 - run: | - ls -1 */*.tar | xargs docker load + ls -1 */*.tar | xargs docker load -i - uses: docker/login-action@v3 # This `if` adds an additional safety against accidental pushes. if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 14221602b5c63cf7001fd42c9d859f96a6b8e8d1 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 4 Jan 2024 17:48:09 +0100 Subject: [PATCH 26/46] Not sure what to do anymore --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9772b26b59..30ec505bf0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -69,8 +69,9 @@ jobs: with: path: . - uses: docker/setup-buildx-action@v3 + - run: docker load --help # TODO: remove - run: | - ls -1 */*.tar | xargs docker load -i + ls -1 */*.tar | xargs docker load --input - uses: docker/login-action@v3 # This `if` adds an additional safety against accidental pushes. if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From ffa51ecd9b90f56b7b79231b86df3e2f9157f3fb Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 4 Jan 2024 19:19:54 +0100 Subject: [PATCH 27/46] Let's try that --- .github/workflows/deploy.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 30ec505bf0..e992f9f534 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -69,9 +69,8 @@ jobs: with: path: . - uses: docker/setup-buildx-action@v3 - - run: docker load --help # TODO: remove - run: | - ls -1 */*.tar | xargs docker load --input + ls -1 */*.tar | xargs --no-run-if-empty -L 1 docker load --input - uses: docker/login-action@v3 # This `if` adds an additional safety against accidental pushes. if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 3f2883aea06df6305cf8a15e6c6cb43901e8ded9 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 4 Jan 2024 20:31:22 +0100 Subject: [PATCH 28/46] Let's try with manual tags --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e992f9f534..178da81ee2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -81,7 +81,7 @@ jobs: - run: docker images # TODO remove - run: docker images --no-trunc -q ghcr.io/smol-dot/full-node | tr "\n" " " # TODO: remove - run: | - docker buildx imagetools create --dry-run -t ghcr.io/smol-dot/full-node:main $(docker images --no-trunc -q ghcr.io/smol-dot/full-node | tr "\n" " ") + docker buildx imagetools create --dry-run -t ghcr.io/smol-dot/full-node:main ghcr.io/smol-dot/full-node:amd64 ghcr.io/smol-dot/full-node:arm64 - run: docker images # TODO remove - run: docker push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 0e0998179f1bf8fcbe3128f446d40029f62abe8c Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Fri, 5 Jan 2024 09:20:08 +0100 Subject: [PATCH 29/46] Try `docker manifest` --- .github/workflows/deploy.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 178da81ee2..f03a4e61fa 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -81,9 +81,12 @@ jobs: - run: docker images # TODO remove - run: docker images --no-trunc -q ghcr.io/smol-dot/full-node | tr "\n" " " # TODO: remove - run: | - docker buildx imagetools create --dry-run -t ghcr.io/smol-dot/full-node:main ghcr.io/smol-dot/full-node:amd64 ghcr.io/smol-dot/full-node:arm64 + docker manifest create \ + ghcr.io/smol-dot/full-node:main \ + --amend ghcr.io/smol-dot/full-node:amd64 ghcr.io/smol-dot/full-node:arm64 \ + --amend ghcr.io/smol-dot/full-node:amd64 ghcr.io/smol-dot/full-node:arm64 - run: docker images # TODO remove - - run: docker push ghcr.io/smol-dot/full-node:main + - run: docker manifest push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} build-js-doc: From 6e69dacc14435cf036cc195bd44220b9477a60ab Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Fri, 5 Jan 2024 12:53:06 +0100 Subject: [PATCH 30/46] Typo --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f03a4e61fa..aceb49e95e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -83,8 +83,8 @@ jobs: - run: | docker manifest create \ ghcr.io/smol-dot/full-node:main \ - --amend ghcr.io/smol-dot/full-node:amd64 ghcr.io/smol-dot/full-node:arm64 \ - --amend ghcr.io/smol-dot/full-node:amd64 ghcr.io/smol-dot/full-node:arm64 + --amend ghcr.io/smol-dot/full-node:amd64 \ + --amend ghcr.io/smol-dot/full-node:arm64 - run: docker images # TODO remove - run: docker manifest push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 9e30178d9bb06877682cea19e174f5a8a2b2f983 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 18 Jan 2024 10:59:42 +0100 Subject: [PATCH 31/46] Let's try only amd64 --- .github/workflows/deploy.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index aceb49e95e..cce8bff2b7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -83,8 +83,7 @@ jobs: - run: | docker manifest create \ ghcr.io/smol-dot/full-node:main \ - --amend ghcr.io/smol-dot/full-node:amd64 \ - --amend ghcr.io/smol-dot/full-node:arm64 + --amend ghcr.io/smol-dot/full-node:amd64 # TODO: put back arm64 - run: docker images # TODO remove - run: docker manifest push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From bfa2fde2526965d72b936ab0c6d33eacd289720d Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 18 Jan 2024 11:02:24 +0100 Subject: [PATCH 32/46] Add manifest inspect commands to debug --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cce8bff2b7..fa31feede4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -80,6 +80,8 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - run: docker images # TODO remove - run: docker images --no-trunc -q ghcr.io/smol-dot/full-node | tr "\n" " " # TODO: remove + - run: docker manifest inspect -v ghcr.io/smol-dot/full-node:amd64 # TODO: remove + - run: docker manifest inspect -v ghcr.io/smol-dot/full-node:arm64 # TODO: remove - run: | docker manifest create \ ghcr.io/smol-dot/full-node:main \ From 86e63ecaf8b0072c6f6d1d30f2513d9357ba61ba Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 18 Jan 2024 12:20:40 +0100 Subject: [PATCH 33/46] Try passing by hash --- .github/workflows/deploy.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fa31feede4..2c980b914c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -79,13 +79,11 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - run: docker images # TODO remove - - run: docker images --no-trunc -q ghcr.io/smol-dot/full-node | tr "\n" " " # TODO: remove - - run: docker manifest inspect -v ghcr.io/smol-dot/full-node:amd64 # TODO: remove - - run: docker manifest inspect -v ghcr.io/smol-dot/full-node:arm64 # TODO: remove + - run: docker images --no-trunc -q ghcr.io/smol-dot/full-node | sed 's/.*/--amend &/' # TODO: remove - run: | docker manifest create \ ghcr.io/smol-dot/full-node:main \ - --amend ghcr.io/smol-dot/full-node:amd64 # TODO: put back arm64 + $(docker images --no-trunc -q ghcr.io/smol-dot/full-node | sed 's/.*/--amend &/') - run: docker images # TODO remove - run: docker manifest push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From e12aa5268d27608da98dd4297ac3dbaf4eddb7b8 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 18 Jan 2024 12:21:29 +0100 Subject: [PATCH 34/46] Add space, not sure if needed --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2c980b914c..1207ed1570 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -79,11 +79,11 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - run: docker images # TODO remove - - run: docker images --no-trunc -q ghcr.io/smol-dot/full-node | sed 's/.*/--amend &/' # TODO: remove + - run: docker images --no-trunc -q ghcr.io/smol-dot/full-node | sed 's/.*/ --amend &/' # TODO: remove - run: | docker manifest create \ ghcr.io/smol-dot/full-node:main \ - $(docker images --no-trunc -q ghcr.io/smol-dot/full-node | sed 's/.*/--amend &/') + $(docker images --no-trunc -q ghcr.io/smol-dot/full-node | sed 's/.*/ --amend &/') - run: docker images # TODO remove - run: docker manifest push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 373552caecf3f018ab866b5ba86343e9093fb294 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 18 Jan 2024 16:50:15 +0100 Subject: [PATCH 35/46] Try remove new lines just to make sure --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1207ed1570..320f027993 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -79,11 +79,11 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - run: docker images # TODO remove - - run: docker images --no-trunc -q ghcr.io/smol-dot/full-node | sed 's/.*/ --amend &/' # TODO: remove + - run: docker images --no-trunc -q ghcr.io/smol-dot/full-node | sed 's/.*/ --amend &/' | tr -d '\n' # TODO: remove - run: | docker manifest create \ ghcr.io/smol-dot/full-node:main \ - $(docker images --no-trunc -q ghcr.io/smol-dot/full-node | sed 's/.*/ --amend &/') + $(docker images --no-trunc -q ghcr.io/smol-dot/full-node | sed 's/.*/ --amend &/' | tr -d '\n') - run: docker images # TODO remove - run: docker manifest push ghcr.io/smol-dot/full-node:main if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} From 78a945c7027cfe4e10cfd4b42b00cafe0781a9ea Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 31 Jan 2024 11:21:24 +0100 Subject: [PATCH 36/46] Use the new Mac runners --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 320f027993..70647c5c54 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,7 +32,7 @@ jobs: strategy: matrix: platform: [linux/amd64, linux/arm64] - runs-on: ubuntu-latest + runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || 'macos-14' }} permissions: contents: read steps: From 66c8058e5928ff1aa535a2ce06b6cef747d9e1d2 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 31 Jan 2024 11:26:15 +0100 Subject: [PATCH 37/46] Install docker --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 70647c5c54..3f99bdc93c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,6 +36,8 @@ jobs: permissions: contents: read steps: + - run: brew install docker + if: ${{ matrix.platform == 'linux/arm64' }} - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - uses: actions/checkout@v4 From c2e25e7724dfb0418f050371fbd23baa8266f9c9 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 31 Jan 2024 11:29:47 +0100 Subject: [PATCH 38/46] Try also docker-machine --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3f99bdc93c..7810664862 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,7 +36,7 @@ jobs: permissions: contents: read steps: - - run: brew install docker + - run: brew install docker docker-machine if: ${{ matrix.platform == 'linux/arm64' }} - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 From 4ae181da995a3b12d1d96123e559aedc2ce2dc9a Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 31 Jan 2024 11:31:03 +0100 Subject: [PATCH 39/46] Following instructions --- .github/workflows/deploy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7810664862..978de075cb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,7 +36,9 @@ jobs: permissions: contents: read steps: - - run: brew install docker docker-machine + - run: | + brew install docker docker-machine + brew services start docker-machine if: ${{ matrix.platform == 'linux/arm64' }} - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 From deeabf8f691d36029b19d22ce1b7170b5ffa595d Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 31 Jan 2024 11:34:21 +0100 Subject: [PATCH 40/46] Revert and abandon for now --- .github/workflows/deploy.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 978de075cb..23eebb1914 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,10 +36,7 @@ jobs: permissions: contents: read steps: - - run: | - brew install docker docker-machine - brew services start docker-machine - if: ${{ matrix.platform == 'linux/arm64' }} + - run: brew install docker - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - uses: actions/checkout@v4 From 2281739a84438e7886b2b521151f46263d8878ee Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 31 Jan 2024 11:35:39 +0100 Subject: [PATCH 41/46] Try again something --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 23eebb1914..43f5fe58f9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,7 +37,9 @@ jobs: contents: read steps: - run: brew install docker + if: ${{ matrix.platform == 'linux/arm64' }} - uses: docker/setup-qemu-action@v3 + if: ${{ matrix.platform == 'linux/amd64' }} - uses: docker/setup-buildx-action@v3 - uses: actions/checkout@v4 with: From 3400e9842f1818be2ca29e5b42fcecfddbc4ba87 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 31 Jan 2024 11:38:58 +0100 Subject: [PATCH 42/46] Try more things --- .github/workflows/deploy.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 43f5fe58f9..4960f48b67 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,11 +36,8 @@ jobs: permissions: contents: read steps: - - run: brew install docker + - run: brew install docker docker-machine if: ${{ matrix.platform == 'linux/arm64' }} - - uses: docker/setup-qemu-action@v3 - if: ${{ matrix.platform == 'linux/amd64' }} - - uses: docker/setup-buildx-action@v3 - uses: actions/checkout@v4 with: path: repo From ab88cfef4d9b89a208612e5d6d49419f2c881fbc Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 31 Jan 2024 11:44:12 +0100 Subject: [PATCH 43/46] Try something else --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4960f48b67..89da01a1da 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,6 +38,8 @@ jobs: steps: - run: brew install docker docker-machine if: ${{ matrix.platform == 'linux/arm64' }} + - uses: docker/setup-buildx-action@v3 + if: ${{ matrix.platform == 'linux/amd64' }} - uses: actions/checkout@v4 with: path: repo From 6e4d571a95d6caeeeab4d8b15e642a718ad807eb Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 31 Jan 2024 11:49:01 +0100 Subject: [PATCH 44/46] Again, try something else --- .github/workflows/deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 89da01a1da..1150b5792a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,10 +36,11 @@ jobs: permissions: contents: read steps: - - run: brew install docker docker-machine + - run: | + brew install docker colima + colima start if: ${{ matrix.platform == 'linux/arm64' }} - uses: docker/setup-buildx-action@v3 - if: ${{ matrix.platform == 'linux/amd64' }} - uses: actions/checkout@v4 with: path: repo From 0a7d798ade3b27058214a2450fcf61ce4646ea63 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 31 Jan 2024 11:53:24 +0100 Subject: [PATCH 45/46] Try issue fix --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1150b5792a..03087fae71 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,6 +38,7 @@ jobs: steps: - run: | brew install docker colima + brew reinstall -f --force-bottle qemu # TODO: Fix attempt for colima start if: ${{ matrix.platform == 'linux/arm64' }} - uses: docker/setup-buildx-action@v3 From 8a1585b3789e4e652427fb3e4fc44cffdfbfa067 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 31 Jan 2024 12:00:09 +0100 Subject: [PATCH 46/46] Try again differently --- .github/workflows/deploy.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 03087fae71..708f6dc3d4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,10 +37,9 @@ jobs: contents: read steps: - run: | - brew install docker colima - brew reinstall -f --force-bottle qemu # TODO: Fix attempt for + brew install docker colima start - if: ${{ matrix.platform == 'linux/arm64' }} + if: runner.os == 'macos' - uses: docker/setup-buildx-action@v3 - uses: actions/checkout@v4 with: