From e55aa14dfeb267295bfceda530e346dd42ee1406 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Tue, 10 Oct 2023 01:22:49 +0200 Subject: [PATCH] harmonize workflow trigger. activated test2 for buster --- .github/workflows/docker_bullseye.yml | 19 +++-------- .github/workflows/docker_bullseye_altuser.yml | 6 ++++ .github/workflows/docker_buster.yml | 32 ++++++++++--------- 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/.github/workflows/docker_bullseye.yml b/.github/workflows/docker_bullseye.yml index b051f4a9e..5bd6ce209 100644 --- a/.github/workflows/docker_bullseye.yml +++ b/.github/workflows/docker_bullseye.yml @@ -1,9 +1,12 @@ name: Test Install Scripts for Bullseye on Docker on: + schedule: + # run at 5 every sunday + - cron: '* 5 * * 0' push: branches-ignore: - - 'future3/**' + - 'future3/**' pull_request: # The branches below must be a subset of the branches above branches: [ develop ] @@ -61,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 3a8eadd3c..ae0e8049a 100644 --- a/.github/workflows/docker_bullseye_altuser.yml +++ b/.github/workflows/docker_bullseye_altuser.yml @@ -4,6 +4,12 @@ on: schedule: # run at 5 every sunday - cron: '* 5 * * 0' + push: + branches-ignore: + - 'future3/**' + pull_request: + # The branches below must be a subset of the branches above + branches: [ develop ] jobs: diff --git a/.github/workflows/docker_buster.yml b/.github/workflows/docker_buster.yml index dc15f0cba..710ef62c8 100644 --- a/.github/workflows/docker_buster.yml +++ b/.github/workflows/docker_buster.yml @@ -1,9 +1,15 @@ name: Test Install Scripts for Buster on Docker on: - schedule: - # run at 5 every sunday - - cron: '* 5 * * 0' + schedule: + # run at 5 every sunday + - cron: '* 5 * * 0' + push: + branches-ignore: + - 'future3/**' + pull_request: + # The branches below must be a subset of the branches above + branches: [ develop ] jobs: @@ -41,14 +47,14 @@ jobs: args: | /code/scripts/installscripts/tests/run_installation_tests.sh -# - name: Run run_installation_tests2.sh Buster ARMv7 -# uses: tj-actions/docker-run@v2 -# with: -# image: rpi-jukebox-rfid-buster:latest -# options: --platform linux/arm/v7 -# name: run_installation_tests2.sh -# args: | -# /code/scripts/installscripts/tests/run_installation_tests2.sh + - name: Run run_installation_tests2.sh Buster ARMv7 + uses: tj-actions/docker-run@v2 + with: + image: rpi-jukebox-rfid-buster:latest + options: --platform linux/arm/v7 + 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 @@ -58,7 +64,3 @@ jobs: name: run_installation_tests3.sh args: | /code/scripts/installscripts/tests/run_installation_tests3.sh - - - -