From fd5b69a572305be6a58d0290ecc45dd0a4bb2cb8 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Mon, 1 Jul 2024 18:36:37 +0100 Subject: [PATCH 1/3] Enable 32bit ARM builds for Node v18 --- .github/workflows/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7ef7f716..b17d540b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -119,6 +119,12 @@ jobs: fi fi + if [[ "${{ matrix.node }}" == "18"]]; then + echo "platorms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT + else + echo "platorms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT + fi + echo $TAGS echo "tags=$TAGS" >> $GITHUB_OUTPUT echo "push=$PUSH" >> $GITHUB_OUTPUT @@ -143,7 +149,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - platforms: linux/amd64, linux/arm64 + platforms: ${{ steps.nrVersion.outputs.platforms }} push: ${{ steps.nrVersion.outputs.push }} file: .docker/Dockerfile.alpine build-args: | From c7464b86c8130966b9913880f6b9313d7834a8c7 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Mon, 1 Jul 2024 18:40:52 +0100 Subject: [PATCH 2/3] Fix typo --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b17d540b..d14e7c5f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -120,9 +120,9 @@ jobs: fi if [[ "${{ matrix.node }}" == "18"]]; then - echo "platorms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT + echo "platforms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT else - echo "platorms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT + echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT fi echo $TAGS From 4b83b2301f00a22685633308a66d1c2c4ee1bd4a Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Sun, 7 Jul 2024 10:29:19 +0100 Subject: [PATCH 3/3] Enable 32bit ARM builds again --- .github/workflows/main.yml | 42 +++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d14e7c5f..90e54af6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,6 +26,7 @@ jobs: runs-on: ubuntu-latest strategy: + max-parallel: 2 matrix: node: [18, 20, 22] suffix: ["", "-minimal"] @@ -54,9 +55,33 @@ jobs: - name: Setup QEMU uses: docker/setup-qemu-action@v3 + with: + platforms: arm64 + - + name: Set up SSH key pi5 + uses: MrSquaare/ssh-setup-action@2d028b70b5e397cf8314c6eaea229a6c3e34977a # v3.1.0 + with: + host: ${{ secrets.SSH_REMOTE_HOST}} + private-key: ${{ secrets.SSH_PRIVATE_KEY }} + private-key-name: remote + port: 2022 + - + name: Set up SSH key pi4 + uses: MrSquaare/ssh-setup-action@2d028b70b5e397cf8314c6eaea229a6c3e34977a # v3.1.0 + with: + host: ${{ secrets.SSH_REMOTE_HOST}} + private-key: ${{ secrets.SSH_PRIVATE_KEY }} + private-key-name: remote + port: 2023 - name: Setup Docker buildx uses: docker/setup-buildx-action@v3 + with: + append: | + - endpoint: ssh://nr@${{ secrets.SSH_REMOTE_HOST }}:2023 + platforms: linux/arm/v6,linux/arm/v7 + - endpoint: ssh://nr@${{ secrets.SSH_REMOTE_HOST }}:2022 + platforms: linux/arm64 - name: Get Date id: date # run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%SZ')" @@ -119,11 +144,18 @@ jobs: fi fi - if [[ "${{ matrix.node }}" == "18"]]; then - echo "platforms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT - else - echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT - fi + # if [[ "${{ matrix.node }}" == "18"]]; then + # echo "platforms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT + # else + # echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT + # fi + + # if [[ "${{ matrix.suffix }}" == "-minimal" ]]; then + # echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT + # else + # echo "platforms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT + # fi + echo "platforms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT echo $TAGS echo "tags=$TAGS" >> $GITHUB_OUTPUT