From 1f626c00b4f30d913abf5d74de1f70a37e455ebe Mon Sep 17 00:00:00 2001
From: Philipp Imhof <52650214+PhilippImhof@users.noreply.github.com>
Date: Fri, 26 Apr 2024 08:23:54 +0200
Subject: [PATCH] simplify CI and add status badges

---
 .github/workflows/phpunit.yml                | 82 --------------------
 .github/workflows/{behat.yml => testing.yml} |  8 +-
 README.md                                    |  5 +-
 3 files changed, 10 insertions(+), 85 deletions(-)
 delete mode 100644 .github/workflows/phpunit.yml
 rename .github/workflows/{behat.yml => testing.yml} (93%)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
deleted file mode 100644
index 2831ef4..0000000
--- a/.github/workflows/phpunit.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-name: Automated unit tests
-
-on: [push, pull_request]
-
-jobs:
-  test:
-    name: Automated unit tests
-    runs-on: ubuntu-22.04
-
-    services:
-      postgres:
-        image: postgres:13
-        env:
-          POSTGRES_USER: 'postgres'
-          POSTGRES_HOST_AUTH_METHOD: 'trust'
-        ports:
-          - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
-      mariadb:
-        image: mariadb:10
-        env:
-          MYSQL_USER: 'root'
-          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-          MYSQL_CHARACTER_SET_SERVER: "utf8mb4"
-          MYSQL_COLLATION_SERVER: "utf8mb4_unicode_ci"
-
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ['8.0', '8.1', '8.2', '8.3']
-        moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE', 'MOODLE_404_STABLE', 'main']
-        database: [mariadb,pgsql]
-        exclude:
-          - moodle-branch: 'MOODLE_401_STABLE'
-            php: '8.2'
-          - moodle-branch: 'MOODLE_401_STABLE'
-            php: '8.3'
-          - moodle-branch: 'MOODLE_402_STABLE'
-            php: '8.3'
-          - moodle-branch: 'MOODLE_403_STABLE'
-            php: '8.3'
-          - moodle-branch: 'MOODLE_404_STABLE'
-            php: '8.0'
-          - moodle-branch: 'main'
-            php: '8.0'
-
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-        with:
-          path: plugin
-
-      - name: Setup PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          ini-values: max_input_vars=5000
-          coverage: none
-
-      - name: Initialise moodle-plugin-ci
-        run: |
-          composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^4
-          echo $(cd ci/bin; pwd) >> $GITHUB_PATH
-          echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
-          sudo locale-gen en_AU.UTF-8
-          echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV
-
-      - name: Install moodle-plugin-ci
-        run: |
-          moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
-        env:
-          DB: ${{ matrix.database }}
-          MOODLE_BRANCH: ${{ matrix.moodle-branch }}
-
-      - name: PHPUnit tests
-        if: ${{ always() }}
-        run: |
-          moodle-plugin-ci phpunit --fail-on-warning
\ No newline at end of file
diff --git a/.github/workflows/behat.yml b/.github/workflows/testing.yml
similarity index 93%
rename from .github/workflows/behat.yml
rename to .github/workflows/testing.yml
index fb07c5e..59f4fc7 100644
--- a/.github/workflows/behat.yml
+++ b/.github/workflows/testing.yml
@@ -1,10 +1,10 @@
-name: Automated acceptance tests
+name: Automated testing
 
 on: [push, pull_request]
 
 jobs:
   test:
-    name: Automated acceptance tests
+    name: Automated testing
     runs-on: ubuntu-22.04
 
     services:
@@ -75,5 +75,9 @@ jobs:
           MOODLE_BRANCH: ${{ matrix.moodle-branch }}
           MOODLE_APP: false
 
+      - name: PHPUnit tests
+        run: moodle-plugin-ci phpunit --fail-on-warning
+
       - name: Behat features
+        if: ${{ always() }}
         run: moodle-plugin-ci behat --auto-rerun 1 --profile chrome
\ No newline at end of file
diff --git a/README.md b/README.md
index 0449135..b9c4c3d 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+![GitHub Release](https://img.shields.io/github/v/release/PhilippImhof/moodle-quiz_essaydownload)
+[![Automated code checks](https://github.com/PhilippImhof/moodle-quiz_essaydownload/actions/workflows/checks.yml/badge.svg)](https://github.com/PhilippImhof/moodle-quiz_essaydownload/actions/workflows/checks.yml) [![Automated testing](https://github.com/PhilippImhof/moodle-quiz_essaydownload/actions/workflows/testing.yml/badge.svg)](https://github.com/PhilippImhof/moodle-quiz_essaydownload/actions/workflows/testing.yml)
+
 moodle-quiz_essaydownload
 -------------------------
 
@@ -24,7 +27,7 @@ For more information, please see the [Moodle docs](https://docs.moodle.org/en/In
 The plugin will then generate a ZIP archive containing the requested data and initiate
 the download in your browser.
 
-Note: No confirmation will be shown. Once you get your ZIP file, the work is done. The
+Note: No confirmation will be shown. Once you get your ZIP file, the work is done.
 
 
 #### Grouping by attempt or question?