diff --git a/.github/workflows/docker_bullseye.yml b/.github/workflows/docker_bullseye.yml index 05b06e138..5bd6ce209 100644 --- a/.github/workflows/docker_bullseye.yml +++ b/.github/workflows/docker_bullseye.yml @@ -64,17 +64,3 @@ jobs: options: --platform linux/arm/v7 args: | /code/scripts/installscripts/tests/run_installation_tests3.sh - - - - - - - - - - - - - - diff --git a/.github/workflows/docker_bullseye_altuser.yml b/.github/workflows/docker_bullseye_altuser.yml index daedb1119..60e6ff7ea 100644 --- a/.github/workflows/docker_bullseye_altuser.yml +++ b/.github/workflows/docker_bullseye_altuser.yml @@ -64,8 +64,3 @@ jobs: name: run_installation_tests3_altuser.sh args: | /code/scripts/installscripts/tests/run_installation_tests3_altuser.sh - - - - - diff --git a/.github/workflows/docker_buster.yml b/.github/workflows/docker_buster.yml index 22293f46e..b76c3833c 100644 --- a/.github/workflows/docker_buster.yml +++ b/.github/workflows/docker_buster.yml @@ -13,40 +13,40 @@ on: jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3.0.0 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.0.0 + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3.0.0 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3.0.0 - - name: Build Buster ARMv7 - uses: docker/build-push-action@v5 - with: - context: . - load: true - push: false - file: ./ci/Dockerfile.buster.test_install.armv7 - platforms: linux/arm/v7 - tags: rpi-jukebox-rfid-buster:latest - cache-from: type=gha,scope=$GITHUB_REF_NAME-buster - cache-to: type=gha,mode=max,scope=$GITHUB_REF_NAME-buster - - - name: Run run_installation_tests.sh Buster ARMv7 - uses: tj-actions/docker-run@v2 - with: - image: rpi-jukebox-rfid-buster:latest - options: --platform linux/arm/v7 - name: run_installation_tests.sh - args: | - /code/scripts/installscripts/tests/run_installation_tests.sh - + - name: Build Buster ARMv7 + uses: docker/build-push-action@v5 + with: + context: . + load: true + push: false + file: ./ci/Dockerfile.buster.test_install.armv7 + platforms: linux/arm/v7 + tags: rpi-jukebox-rfid-buster:latest + cache-from: type=gha,scope=$GITHUB_REF_NAME-buster + cache-to: type=gha,mode=max,scope=$GITHUB_REF_NAME-buster + + - name: Run run_installation_tests.sh Buster ARMv7 + uses: tj-actions/docker-run@v2 + with: + image: rpi-jukebox-rfid-buster:latest + options: --platform linux/arm/v7 + name: run_installation_tests.sh + args: | + /code/scripts/installscripts/tests/run_installation_tests.sh + # - name: Run run_installation_tests2.sh Buster ARMv7 # uses: tj-actions/docker-run@v2 # with: @@ -55,16 +55,12 @@ jobs: # name: run_installation_tests2.sh # args: | # /code/scripts/installscripts/tests/run_installation_tests2.sh - - - name: Run run_installation_tests3.sh Buster ARMv7 - uses: tj-actions/docker-run@v2 - with: - image: rpi-jukebox-rfid-buster:latest - options: --platform linux/arm/v7 - name: run_installation_tests3.sh - args: | - /code/scripts/installscripts/tests/run_installation_tests3.sh - - - - + + - name: Run run_installation_tests3.sh Buster ARMv7 + uses: tj-actions/docker-run@v2 + with: + image: rpi-jukebox-rfid-buster:latest + options: --platform linux/arm/v7 + name: run_installation_tests3.sh + args: | + /code/scripts/installscripts/tests/run_installation_tests3.sh