From abadfd1accec544307848b47d66420f06ae054d1 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 26 Oct 2022 18:18:57 +0100 Subject: [PATCH 01/11] Attempts to fix platform issue --- .github/workflows/build-balena-disk-image.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml index e47baa206..83f4535ec 100644 --- a/.github/workflows/build-balena-disk-image.yaml +++ b/.github/workflows/build-balena-disk-image.yaml @@ -25,18 +25,31 @@ jobs: - name: Login run: balena login --token ${{ secrets.BALENA_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Get base board run: | # Logic for Raspberry Pi 1 if [ "${{ matrix.board }}" == 'pi1' ]; then echo "BALENA_IMAGE=raspberry-pi" >> $GITHUB_ENV + echo 'TARGET_PLATFORM=linux/arm/v6' >> $GITHUB_ENV # Logic for Raspberry Pi 2 elif [ "${{ matrix.board }}" == 'pi2' ]; then echo "BALENA_IMAGE=raspberry-pi2" >> $GITHUB_ENV + echo 'TARGET_PLATFORM=linux/arm/v6' >> $GITHUB_ENV else echo "BALENA_IMAGE=raspberrypi3" >> $GITHUB_ENV + echo 'TARGET_PLATFORM=linux/arm/v7' >> $GITHUB_ENV fi + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + driver-opts: | + platforms="$TARGET_PLATFORM" + - name: Download image run: | balena os \ From 68ee2de28513f3263fd063bace82354d0850f6be Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 26 Oct 2022 18:20:57 +0100 Subject: [PATCH 02/11] Try without quotes --- .github/workflows/build-balena-disk-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml index 83f4535ec..8c8c22d3b 100644 --- a/.github/workflows/build-balena-disk-image.yaml +++ b/.github/workflows/build-balena-disk-image.yaml @@ -48,7 +48,7 @@ jobs: with: install: true driver-opts: | - platforms="$TARGET_PLATFORM" + platforms=$TARGET_PLATFORM - name: Download image run: | From ac228556ff91d12ef1ba99e95b688e764a94d1d3 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 26 Oct 2022 18:22:54 +0100 Subject: [PATCH 03/11] Try without specifying target platform --- .github/workflows/build-balena-disk-image.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml index 8c8c22d3b..4471c308a 100644 --- a/.github/workflows/build-balena-disk-image.yaml +++ b/.github/workflows/build-balena-disk-image.yaml @@ -47,8 +47,6 @@ jobs: uses: docker/setup-buildx-action@v2 with: install: true - driver-opts: | - platforms=$TARGET_PLATFORM - name: Download image run: | From 15f46b76444c5066e105d3a79eef9f7dcb3f92cb Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 26 Oct 2022 19:09:06 +0100 Subject: [PATCH 04/11] Test another platform setting --- .github/workflows/build-balena-disk-image.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml index 4471c308a..96efa721c 100644 --- a/.github/workflows/build-balena-disk-image.yaml +++ b/.github/workflows/build-balena-disk-image.yaml @@ -4,7 +4,8 @@ jobs: balena-build-images: strategy: matrix: - board: ['pi1', 'pi2', 'pi3', 'pi4'] + # board: ['pi1', 'pi2', 'pi3', 'pi4'] + board: ['pi3', 'pi4'] runs-on: ubuntu-latest steps: - name: Checkout @@ -47,7 +48,7 @@ jobs: uses: docker/setup-buildx-action@v2 with: install: true - + platforms: "$TARGET_PLATFORM" - name: Download image run: | balena os \ From 0a246c8ed665e39db46c6ed4ba942d5ec9208775 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 26 Oct 2022 19:11:44 +0100 Subject: [PATCH 05/11] Another target build attempt --- .github/workflows/build-balena-disk-image.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml index 96efa721c..76d1155e5 100644 --- a/.github/workflows/build-balena-disk-image.yaml +++ b/.github/workflows/build-balena-disk-image.yaml @@ -34,21 +34,18 @@ jobs: # Logic for Raspberry Pi 1 if [ "${{ matrix.board }}" == 'pi1' ]; then echo "BALENA_IMAGE=raspberry-pi" >> $GITHUB_ENV - echo 'TARGET_PLATFORM=linux/arm/v6' >> $GITHUB_ENV # Logic for Raspberry Pi 2 elif [ "${{ matrix.board }}" == 'pi2' ]; then echo "BALENA_IMAGE=raspberry-pi2" >> $GITHUB_ENV - echo 'TARGET_PLATFORM=linux/arm/v6' >> $GITHUB_ENV else echo "BALENA_IMAGE=raspberrypi3" >> $GITHUB_ENV - echo 'TARGET_PLATFORM=linux/arm/v7' >> $GITHUB_ENV fi - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: install: true - platforms: "$TARGET_PLATFORM" + platforms: linux/arm/v6,linux/arm/v7 - name: Download image run: | balena os \ From c0ff24d40162cb958d634bd4acfc26873f36498c Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 27 Oct 2022 14:31:33 +0100 Subject: [PATCH 06/11] Attempts to solve packaging with Balenas community-cli-action instead --- .../workflows/build-balena-disk-image.yaml | 45 +++++-------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml index 76d1155e5..43870954a 100644 --- a/.github/workflows/build-balena-disk-image.yaml +++ b/.github/workflows/build-balena-disk-image.yaml @@ -11,24 +11,6 @@ jobs: - name: Checkout uses: actions/checkout@v2.3.4 - - name: Setup NodeJS - uses: actions/setup-node@v2 - with: - node-version: 16 - - - name: Install latest balena-cli - run: | - npm install \ - --ignore-scripts \ - -g \ - balena-cli@14.5.2 - - - name: Login - run: balena login --token ${{ secrets.BALENA_TOKEN }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Get base board run: | # Logic for Raspberry Pi 1 @@ -41,24 +23,19 @@ jobs: echo "BALENA_IMAGE=raspberrypi3" >> $GITHUB_ENV fi - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + - name: balena CLI Action + uses: balena-labs-research/community-cli-action@1.0.0 with: - install: true - platforms: linux/arm/v6,linux/arm/v7 - - name: Download image - run: | - balena os \ + balena_token: ${{secrets.BALENA_TOKEN}} + balena_cli_commands: > download "$BALENA_IMAGE" \ - --output "$BALENA_IMAGE.img" \ - --version default - - - name: Preload image - run: | - balena preload \ - "$BALENA_IMAGE.img" \ - --fleet screenly_ose/screenly-ose-${{ matrix.board }} \ - --commit latest + --output "$BALENA_IMAGE.img" \ + --version default; + preload \ + "$BALENA_IMAGE.img" \ + --fleet screenly_ose/screenly-ose-${{ matrix.board }} \ + --commit latest + balena_cli_version: 13.7.1 - name: Zip image run: | From 2a6a97a03e6e6fd10a26ef8cc40ee4784380c4c6 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 27 Oct 2022 14:43:56 +0100 Subject: [PATCH 07/11] Fixes syntax --- .github/workflows/build-balena-disk-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml index 43870954a..ae8453078 100644 --- a/.github/workflows/build-balena-disk-image.yaml +++ b/.github/workflows/build-balena-disk-image.yaml @@ -28,7 +28,7 @@ jobs: with: balena_token: ${{secrets.BALENA_TOKEN}} balena_cli_commands: > - download "$BALENA_IMAGE" \ + os download "$BALENA_IMAGE" \ --output "$BALENA_IMAGE.img" \ --version default; preload \ From 3f0c20df6577f1fb247c20931ed00a754742655e Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 27 Oct 2022 14:48:33 +0100 Subject: [PATCH 08/11] Breaks balena action into two steps --- .github/workflows/build-balena-disk-image.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml index ae8453078..8cc4c9cd0 100644 --- a/.github/workflows/build-balena-disk-image.yaml +++ b/.github/workflows/build-balena-disk-image.yaml @@ -23,14 +23,21 @@ jobs: echo "BALENA_IMAGE=raspberrypi3" >> $GITHUB_ENV fi - - name: balena CLI Action + - name: balena CLI Action - download uses: balena-labs-research/community-cli-action@1.0.0 with: balena_token: ${{secrets.BALENA_TOKEN}} - balena_cli_commands: > + balena_cli_commands: | os download "$BALENA_IMAGE" \ --output "$BALENA_IMAGE.img" \ - --version default; + --version default && + balena_cli_version: 13.7.1 + + - name: balena CLI Action - preload + uses: balena-labs-research/community-cli-action@1.0.0 + with: + balena_token: ${{secrets.BALENA_TOKEN}} + balena_cli_commands: | preload \ "$BALENA_IMAGE.img" \ --fleet screenly_ose/screenly-ose-${{ matrix.board }} \ @@ -46,4 +53,4 @@ jobs: - uses: actions/upload-artifact@v3 with: name: Release file - path: "$BALENA_IMAGE.zip" + path: "*.zip" From 7b4c4cd3dda7570b9390eccf2f0bff3f4eb86f69 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 27 Oct 2022 14:49:50 +0100 Subject: [PATCH 09/11] Fixes syntax --- .github/workflows/build-balena-disk-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml index 8cc4c9cd0..544aa2139 100644 --- a/.github/workflows/build-balena-disk-image.yaml +++ b/.github/workflows/build-balena-disk-image.yaml @@ -30,7 +30,7 @@ jobs: balena_cli_commands: | os download "$BALENA_IMAGE" \ --output "$BALENA_IMAGE.img" \ - --version default && + --version default balena_cli_version: 13.7.1 - name: balena CLI Action - preload From b5d5f8bc7f917e2e18f2767e6a51f6c3106397d3 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 28 Oct 2022 11:56:58 +0100 Subject: [PATCH 10/11] Fixes pi4 logic --- .../workflows/build-balena-disk-image.yaml | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml index 544aa2139..6bc283504 100644 --- a/.github/workflows/build-balena-disk-image.yaml +++ b/.github/workflows/build-balena-disk-image.yaml @@ -4,8 +4,7 @@ jobs: balena-build-images: strategy: matrix: - # board: ['pi1', 'pi2', 'pi3', 'pi4'] - board: ['pi3', 'pi4'] + board: ['pi1', 'pi2', 'pi3', 'pi4'] runs-on: ubuntu-latest steps: - name: Checkout @@ -13,14 +12,14 @@ jobs: - name: Get base board run: | - # Logic for Raspberry Pi 1 if [ "${{ matrix.board }}" == 'pi1' ]; then echo "BALENA_IMAGE=raspberry-pi" >> $GITHUB_ENV - # Logic for Raspberry Pi 2 elif [ "${{ matrix.board }}" == 'pi2' ]; then echo "BALENA_IMAGE=raspberry-pi2" >> $GITHUB_ENV - else + elif [ "${{ matrix.board }}" == 'pi3' ]; then echo "BALENA_IMAGE=raspberrypi3" >> $GITHUB_ENV + elif [ "${{ matrix.board }}" == 'pi4' ]; then + echo "BALENA_IMAGE=raspberrypi4" >> $GITHUB_ENV fi - name: balena CLI Action - download @@ -44,10 +43,21 @@ jobs: --commit latest balena_cli_version: 13.7.1 + - name: balena CLI Action - configure + uses: balena-labs-research/community-cli-action@1.0.0 + with: + balena_token: ${{secrets.BALENA_TOKEN}} + balena_cli_commands: | + os configure \ + "$BALENA_IMAGE.img" \ + --config-network=ethernet \ + --fleet screenly_ose/screenly-ose-${{ matrix.board }} + balena_cli_version: 13.7.1 + - name: Zip image run: | zip -9 \ - "$BALENA_IMAGE.zip" \ + "$(date -I)-$BALENA_IMAGE.zip" \ "$BALENA_IMAGE.img" - uses: actions/upload-artifact@v3 From 429c6cd6b8a68816db0e390920bde9fde0eb9c0e Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 28 Oct 2022 11:59:29 +0100 Subject: [PATCH 11/11] Fixes pi4 image name --- .github/workflows/build-balena-disk-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml index 6bc283504..81d296c06 100644 --- a/.github/workflows/build-balena-disk-image.yaml +++ b/.github/workflows/build-balena-disk-image.yaml @@ -19,7 +19,7 @@ jobs: elif [ "${{ matrix.board }}" == 'pi3' ]; then echo "BALENA_IMAGE=raspberrypi3" >> $GITHUB_ENV elif [ "${{ matrix.board }}" == 'pi4' ]; then - echo "BALENA_IMAGE=raspberrypi4" >> $GITHUB_ENV + echo "BALENA_IMAGE=raspberrypi4-64" >> $GITHUB_ENV fi - name: balena CLI Action - download