From 55dce14655a0188998c6ce5603092c387d130565 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Tue, 5 Oct 2021 19:34:51 +0100 Subject: [PATCH] Add execution bit accidentally dropped in #4106 (#4368) Add some smoke tests for the repository. - Add x bit to piholeCheckout.sh. Possibly not needed, but consistency is no bad thing - Ensure all files in script directorys have executable bit set Signed-off-by: Adam Warner --- .github/workflows/test.yml | 31 ++++++++++++++++--- .../Scripts/database_migration/gravity-db.sh | 0 advanced/Scripts/piholeCheckout.sh | 0 automated install/basic-install.sh | 0 4 files changed, 27 insertions(+), 4 deletions(-) mode change 100644 => 100755 advanced/Scripts/database_migration/gravity-db.sh mode change 100644 => 100755 advanced/Scripts/piholeCheckout.sh mode change 100644 => 100755 automated install/basic-install.sh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 129caea4..c2b4dbbc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,21 +5,44 @@ on: types: [opened, synchronize, reopened, ready_for_review] jobs: + smoke-test: + if: github.event.pull_request.draft == false + runs-on: ubuntu-latest + steps: + - + name: Checkout repository + uses: actions/checkout@v2 + - + name: Run Smoke Tests + run: | + # Ensure scripts in repository are executable + IFS=$'\n'; + for f in $(find . -name '*.sh'); do if [[ ! -x $f ]]; then echo "$f is not executable" && FAIL=1; fi ;done + unset IFS; + # If FAIL is 1 then we fail. + [[ $FAIL == 1 ]] && exit 1 || echo "Smoke Tests Passed" + distro-test: if: github.event.pull_request.draft == false runs-on: ubuntu-latest + needs: smoke-test strategy: matrix: distro: [debian_9, debian_10, debian_11, ubuntu_16, ubuntu_18, ubuntu_20, ubuntu_21, centos_7, centos_8, fedora_32, fedora_33] env: DISTRO: ${{matrix.distro}} steps: - - uses: actions/checkout@v1 - - name: Set up Python 3.7 + - + name: Checkout repository + uses: actions/checkout@v2 + - + name: Set up Python 3.7 uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Install dependencies + - + name: Install dependencies run: pip install -r test/requirements.txt - - name: Test with tox + - + name: Test with tox run: tox -c test/tox.${DISTRO}.ini diff --git a/advanced/Scripts/database_migration/gravity-db.sh b/advanced/Scripts/database_migration/gravity-db.sh old mode 100644 new mode 100755 diff --git a/advanced/Scripts/piholeCheckout.sh b/advanced/Scripts/piholeCheckout.sh old mode 100644 new mode 100755 diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh old mode 100644 new mode 100755