From d1324f1b88a56720d0604a56eadec1bcd06589bf Mon Sep 17 00:00:00 2001 From: Peter Ott <3091463+OttPeterR@users.noreply.github.com> Date: Mon, 9 Oct 2023 18:27:33 +0000 Subject: [PATCH 1/7] one build per arch --- .github/workflows/build-tester.yml | 36 +++++++++++++++++++++++-- .github/workflows/publish-container.yml | 32 ++++++++++++++++++++-- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-tester.yml b/.github/workflows/build-tester.yml index 03538fb..154abe5 100644 --- a/.github/workflows/build-tester.yml +++ b/.github/workflows/build-tester.yml @@ -9,11 +9,43 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - - name: Build Container + - name: Build Container (aarch64) uses: home-assistant/builder@master with: args: | --test \ - --all \ + --aarch64 \ + --target babybuddy \ + --docker-hub ottpeterr + - name: Build Container (amd64) + uses: home-assistant/builder@master + with: + args: | + --test \ + --amd64 \ + --target babybuddy \ + --docker-hub ottpeterr + - name: Build Container (armhf) + uses: home-assistant/builder@master + with: + args: | + --test \ + --armhf \ + --target babybuddy \ + --docker-hub ottpeterr + - name: Build Container (armv7) + uses: home-assistant/builder@master + with: + args: | + --test \ + --armv7 \ + --target babybuddy \ + --docker-hub ottpeterr + - name: Build Container (i386) + uses: home-assistant/builder@master + with: + args: | + --test \ + --i386 \ --target babybuddy \ --docker-hub ottpeterr diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index 1ae62cc..15bdedd 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -16,10 +16,38 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build Container + - name: Build Container (aarch64) uses: home-assistant/builder@master with: args: | - --all \ + --aarch64 \ + --target babybuddy \ + --docker-hub ottpeterr + - name: Build Container (amd64) + uses: home-assistant/builder@master + with: + args: | + --amd64 \ + --target babybuddy \ + --docker-hub ottpeterr + - name: Build Container (armhf) + uses: home-assistant/builder@master + with: + args: | + --armhf \ + --target babybuddy \ + --docker-hub ottpeterr + - name: Build Container (armv7) + uses: home-assistant/builder@master + with: + args: | + --armv7 \ + --target babybuddy \ + --docker-hub ottpeterr + - name: Build Container (i386) + uses: home-assistant/builder@master + with: + args: | + --i386 \ --target babybuddy \ --docker-hub ottpeterr From 99299c740c49903bd6d5b4601498bb8625067b97 Mon Sep 17 00:00:00 2001 From: Peter Ott <3091463+OttPeterR@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:39:44 +0000 Subject: [PATCH 2/7] separate jobs --- .github/workflows/build-tester.yml | 28 ++++++++++++++++-- .github/workflows/publish-container.yml | 38 +++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-tester.yml b/.github/workflows/build-tester.yml index 154abe5..fdb657f 100644 --- a/.github/workflows/build-tester.yml +++ b/.github/workflows/build-tester.yml @@ -3,12 +3,16 @@ name: "Build Addon" on: [pull_request] jobs: - build: - name: Test build + setup: runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v3 + + build_aarch64: + needs: setup + runs-on: ubuntu-latest + steps: - name: Build Container (aarch64) uses: home-assistant/builder@master with: @@ -17,6 +21,11 @@ jobs: --aarch64 \ --target babybuddy \ --docker-hub ottpeterr + + build_amd64: + needs: setup + runs-on: ubuntu-latest + steps: - name: Build Container (amd64) uses: home-assistant/builder@master with: @@ -25,6 +34,11 @@ jobs: --amd64 \ --target babybuddy \ --docker-hub ottpeterr + + build_armhf: + needs: setup + runs-on: ubuntu-latest + steps: - name: Build Container (armhf) uses: home-assistant/builder@master with: @@ -33,6 +47,11 @@ jobs: --armhf \ --target babybuddy \ --docker-hub ottpeterr + + build_armv7: + needs: setup + runs-on: ubuntu-latest + steps: - name: Build Container (armv7) uses: home-assistant/builder@master with: @@ -41,6 +60,11 @@ jobs: --armv7 \ --target babybuddy \ --docker-hub ottpeterr + + build_i386: + needs: setup + runs-on: ubuntu-latest + steps: - name: Build Container (i386) uses: home-assistant/builder@master with: diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index 15bdedd..11e7d57 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -5,8 +5,7 @@ on: types: [published] jobs: - publish: - name: Publish + setup: runs-on: ubuntu-latest steps: - name: Checkout code @@ -16,6 +15,13 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + + publish_aarch64: + needs: [setup] + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 - name: Build Container (aarch64) uses: home-assistant/builder@master with: @@ -23,6 +29,13 @@ jobs: --aarch64 \ --target babybuddy \ --docker-hub ottpeterr + + publish_amd64: + needs: [setup] + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 - name: Build Container (amd64) uses: home-assistant/builder@master with: @@ -30,6 +43,13 @@ jobs: --amd64 \ --target babybuddy \ --docker-hub ottpeterr + + publish_armhf: + needs: [setup] + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 - name: Build Container (armhf) uses: home-assistant/builder@master with: @@ -37,6 +57,13 @@ jobs: --armhf \ --target babybuddy \ --docker-hub ottpeterr + + publish_armv7: + needs: [setup] + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 - name: Build Container (armv7) uses: home-assistant/builder@master with: @@ -44,6 +71,13 @@ jobs: --armv7 \ --target babybuddy \ --docker-hub ottpeterr + + publish_i386: + needs: [setup] + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 - name: Build Container (i386) uses: home-assistant/builder@master with: From 3a876a2f3e9d5863ff047a7f7ccb0350896451d5 Mon Sep 17 00:00:00 2001 From: Peter Ott <3091463+OttPeterR@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:44:56 +0000 Subject: [PATCH 3/7] download code in each process --- .github/workflows/build-tester.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-tester.yml b/.github/workflows/build-tester.yml index fdb657f..95388e5 100644 --- a/.github/workflows/build-tester.yml +++ b/.github/workflows/build-tester.yml @@ -3,16 +3,11 @@ name: "Build Addon" on: [pull_request] jobs: - setup: + build_aarch64: runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v3 - - build_aarch64: - needs: setup - runs-on: ubuntu-latest - steps: - name: Build Container (aarch64) uses: home-assistant/builder@master with: @@ -23,9 +18,10 @@ jobs: --docker-hub ottpeterr build_amd64: - needs: setup runs-on: ubuntu-latest steps: + - name: Checkout code + uses: actions/checkout@v3 - name: Build Container (amd64) uses: home-assistant/builder@master with: @@ -36,9 +32,10 @@ jobs: --docker-hub ottpeterr build_armhf: - needs: setup runs-on: ubuntu-latest steps: + - name: Checkout code + uses: actions/checkout@v3 - name: Build Container (armhf) uses: home-assistant/builder@master with: @@ -49,9 +46,10 @@ jobs: --docker-hub ottpeterr build_armv7: - needs: setup runs-on: ubuntu-latest steps: + - name: Checkout code + uses: actions/checkout@v3 - name: Build Container (armv7) uses: home-assistant/builder@master with: @@ -62,9 +60,10 @@ jobs: --docker-hub ottpeterr build_i386: - needs: setup runs-on: ubuntu-latest steps: + - name: Checkout code + uses: actions/checkout@v3 - name: Build Container (i386) uses: home-assistant/builder@master with: From 5ffbe6bfdebc833385a37ff708430128c7424cc1 Mon Sep 17 00:00:00 2001 From: Peter Ott <3091463+OttPeterR@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:47:34 +0000 Subject: [PATCH 4/7] remove redeundant checkout --- .github/workflows/publish-container.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index 11e7d57..81c0e69 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -8,8 +8,6 @@ jobs: setup: runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - name: DockerHub uses: docker/login-action@v2 with: From 4c6baf636c6df54cce54db6377cda93b96d72bb3 Mon Sep 17 00:00:00 2001 From: Peter Ott <3091463+OttPeterR@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:49:42 +0000 Subject: [PATCH 5/7] rename --- .github/workflows/publish-container.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index 81c0e69..9d62e8a 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - - name: Build Container (aarch64) + - name: Publish Container (aarch64) uses: home-assistant/builder@master with: args: | @@ -34,7 +34,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - - name: Build Container (amd64) + - name: Publish Container (amd64) uses: home-assistant/builder@master with: args: | @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - - name: Build Container (armhf) + - name: Publish Container (armhf) uses: home-assistant/builder@master with: args: | @@ -62,7 +62,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - - name: Build Container (armv7) + - name: Publish Container (armv7) uses: home-assistant/builder@master with: args: | @@ -76,7 +76,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - - name: Build Container (i386) + - name: Publish Container (i386) uses: home-assistant/builder@master with: args: | From 3ad4954b70b2b9808d551da8d82c2e9ccb60df96 Mon Sep 17 00:00:00 2001 From: Peter Ott <3091463+OttPeterR@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:55:45 +0000 Subject: [PATCH 6/7] consolidated setup --- .github/workflows/build-tester.yml | 29 +++++++++++++------------ .github/workflows/publish-container.yml | 22 ++++++------------- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-tester.yml b/.github/workflows/build-tester.yml index 95388e5..ad2d28a 100644 --- a/.github/workflows/build-tester.yml +++ b/.github/workflows/build-tester.yml @@ -3,11 +3,16 @@ name: "Build Addon" on: [pull_request] jobs: - build_aarch64: + setup: runs-on: ubuntu-latest steps: - - name: Checkout code + - name: Checkout Code uses: actions/checkout@v3 + + aarch64: + needs: [setup] + runs-on: ubuntu-latest + steps: - name: Build Container (aarch64) uses: home-assistant/builder@master with: @@ -17,11 +22,10 @@ jobs: --target babybuddy \ --docker-hub ottpeterr - build_amd64: + amd64: + needs: [setup] runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - name: Build Container (amd64) uses: home-assistant/builder@master with: @@ -31,11 +35,10 @@ jobs: --target babybuddy \ --docker-hub ottpeterr - build_armhf: + armhf: + needs: [setup] runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - name: Build Container (armhf) uses: home-assistant/builder@master with: @@ -45,11 +48,10 @@ jobs: --target babybuddy \ --docker-hub ottpeterr - build_armv7: + armv7: + needs: [setup] runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - name: Build Container (armv7) uses: home-assistant/builder@master with: @@ -59,11 +61,10 @@ jobs: --target babybuddy \ --docker-hub ottpeterr - build_i386: + i386: + needs: [setup] runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - name: Build Container (i386) uses: home-assistant/builder@master with: diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index 9d62e8a..b75a42c 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -13,13 +13,13 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Checkout Code + uses: actions/checkout@v3 - publish_aarch64: + aarch64: needs: [setup] runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - name: Publish Container (aarch64) uses: home-assistant/builder@master with: @@ -28,12 +28,10 @@ jobs: --target babybuddy \ --docker-hub ottpeterr - publish_amd64: + amd64: needs: [setup] runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - name: Publish Container (amd64) uses: home-assistant/builder@master with: @@ -42,12 +40,10 @@ jobs: --target babybuddy \ --docker-hub ottpeterr - publish_armhf: + armhf: needs: [setup] runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - name: Publish Container (armhf) uses: home-assistant/builder@master with: @@ -56,12 +52,10 @@ jobs: --target babybuddy \ --docker-hub ottpeterr - publish_armv7: + armv7: needs: [setup] runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - name: Publish Container (armv7) uses: home-assistant/builder@master with: @@ -70,12 +64,10 @@ jobs: --target babybuddy \ --docker-hub ottpeterr - publish_i386: + i386: needs: [setup] runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - name: Publish Container (i386) uses: home-assistant/builder@master with: From ce69088e967ff1718d110f5c6014ba22033170bc Mon Sep 17 00:00:00 2001 From: Peter Ott <3091463+OttPeterR@users.noreply.github.com> Date: Mon, 9 Oct 2023 20:00:50 +0000 Subject: [PATCH 7/7] unique checkouts --- .github/workflows/build-tester.yml | 19 ++++++------ .github/workflows/publish-container.yml | 39 ++++++++++++++++++------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-tester.yml b/.github/workflows/build-tester.yml index ad2d28a..9690c51 100644 --- a/.github/workflows/build-tester.yml +++ b/.github/workflows/build-tester.yml @@ -3,16 +3,11 @@ name: "Build Addon" on: [pull_request] jobs: - setup: + aarch64: runs-on: ubuntu-latest steps: - name: Checkout Code uses: actions/checkout@v3 - - aarch64: - needs: [setup] - runs-on: ubuntu-latest - steps: - name: Build Container (aarch64) uses: home-assistant/builder@master with: @@ -23,9 +18,10 @@ jobs: --docker-hub ottpeterr amd64: - needs: [setup] runs-on: ubuntu-latest steps: + - name: Checkout Code + uses: actions/checkout@v3 - name: Build Container (amd64) uses: home-assistant/builder@master with: @@ -36,9 +32,10 @@ jobs: --docker-hub ottpeterr armhf: - needs: [setup] runs-on: ubuntu-latest steps: + - name: Checkout Code + uses: actions/checkout@v3 - name: Build Container (armhf) uses: home-assistant/builder@master with: @@ -49,9 +46,10 @@ jobs: --docker-hub ottpeterr armv7: - needs: [setup] runs-on: ubuntu-latest steps: + - name: Checkout Code + uses: actions/checkout@v3 - name: Build Container (armv7) uses: home-assistant/builder@master with: @@ -62,9 +60,10 @@ jobs: --docker-hub ottpeterr i386: - needs: [setup] runs-on: ubuntu-latest steps: + - name: Checkout Code + uses: actions/checkout@v3 - name: Build Container (i386) uses: home-assistant/builder@master with: diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index b75a42c..2f17e15 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -5,7 +5,7 @@ on: types: [published] jobs: - setup: + aarch64: runs-on: ubuntu-latest steps: - name: DockerHub @@ -15,11 +15,6 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Checkout Code uses: actions/checkout@v3 - - aarch64: - needs: [setup] - runs-on: ubuntu-latest - steps: - name: Publish Container (aarch64) uses: home-assistant/builder@master with: @@ -29,9 +24,15 @@ jobs: --docker-hub ottpeterr amd64: - needs: [setup] runs-on: ubuntu-latest steps: + - name: DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Checkout Code + uses: actions/checkout@v3 - name: Publish Container (amd64) uses: home-assistant/builder@master with: @@ -41,9 +42,15 @@ jobs: --docker-hub ottpeterr armhf: - needs: [setup] runs-on: ubuntu-latest steps: + - name: DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Checkout Code + uses: actions/checkout@v3 - name: Publish Container (armhf) uses: home-assistant/builder@master with: @@ -53,9 +60,15 @@ jobs: --docker-hub ottpeterr armv7: - needs: [setup] runs-on: ubuntu-latest steps: + - name: DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Checkout Code + uses: actions/checkout@v3 - name: Publish Container (armv7) uses: home-assistant/builder@master with: @@ -65,9 +78,15 @@ jobs: --docker-hub ottpeterr i386: - needs: [setup] runs-on: ubuntu-latest steps: + - name: DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Checkout Code + uses: actions/checkout@v3 - name: Publish Container (i386) uses: home-assistant/builder@master with: