From 54d701d5ab959d68f3b0d0201209fe6a95a4a58b Mon Sep 17 00:00:00 2001
From: Benjamin Kott <benjamin.kott@outlook.com>
Date: Tue, 17 Nov 2020 09:52:22 +0100
Subject: [PATCH] [TASK] Update CI Setup (#171)

---
 .ddev/config.yaml        | 23 ++++++++++++++++-------
 .github/workflows/ci.yml | 14 ++++++++++++--
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.ddev/config.yaml b/.ddev/config.yaml
index 1cf4069f..fb69cfd3 100644
--- a/.ddev/config.yaml
+++ b/.ddev/config.yaml
@@ -9,14 +9,16 @@ xdebug_enabled: true
 additional_hostnames: []
 additional_fqdns: []
 mariadb_version: "10.2"
+mysql_version: ""
 provider: default
 use_dns_when_possible: true
+composer_version: "2"
 
 
-# This config.yaml was created with ddev version v1.15.3
-# webimage: drud/ddev-webserver:v1.15.3
-# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.15.1
-# dbaimage: phpmyadmin/phpmyadmin:5
+# This config.yaml was created with ddev version v1.16.0-alpha9
+# webimage: drud/ddev-webserver:20201026_hardened
+# dbimage: drud/ddev-dbserver-mariadb-10.2:20201026_hardened
+# dbaimage: phpmyadmin:5
 # However we do not recommend explicitly wiring these images into the
 # config.yaml as they may break future versions of ddev.
 # You can update this config.yaml using 'ddev config'.
@@ -30,7 +32,7 @@ use_dns_when_possible: true
 
 # docroot: <relative_path> # Relative path to the directory containing index.php.
 
-# php_version: "7.3"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4"
+# php_version: "7.3"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" "8.0"
 
 # You can explicitly specify the webimage, dbimage, dbaimage lines but this
 # is not recommended, as the images are often closely tied to ddev's' behavior,
@@ -51,10 +53,10 @@ use_dns_when_possible: true
 
 # xdebug_enabled: false  # Set to true to enable xdebug and "ddev start" or "ddev restart"
 # Note that for most people the commands
-# "ddev exec enable_xdebug" and "ddev exec disable_xdebug" work better,
+# "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it work better,
 # as leaving xdebug enabled all the time is a big performance hit.
 
-# webserver_type: nginx-fpm  # Can be set to apache-fpm or apache-cgi as well
+# webserver_type: nginx-fpm  # or apache-fpm
 
 # timezone: Europe/Berlin
 # This is the timezone used in the containers and by PHP;
@@ -62,6 +64,13 @@ use_dns_when_possible: true
 # see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 # For example Europe/Dublin or MST7MDT
 
+# composer_version: "2"
+# if composer_version:"" it will use the current ddev default composer release.
+# It can also be set to "1", to get most recent composer v1
+# or "2" for most recent composer v2.
+# It can be set to any existing specific composer version.
+# After first project 'ddev start' this will not be updated until it changes
+
 # additional_hostnames:
 #  - somename
 #  - someothername
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e515e404..1bbb2a21 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         typo3: [ ^9.5, ^10.4 ]
         php: [ '7.2', '7.3', '7.4' ]
@@ -20,9 +21,15 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up PHP Version ${{ matrix.php }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: composer:v2
+
+      - name: Environment Check
         run: |
-          sudo update-alternatives --set php /usr/bin/php${{ matrix.php }}
-          php -v
+          php --version
+          composer --version
 
       - name: Validate composer.json and composer.lock
         run: composer validate
@@ -32,6 +39,9 @@ jobs:
           composer require typo3/cms-core:${{ matrix.typo3 }} --no-progress
           git checkout composer.json
 
+      - name: Info
+        run: composer info
+
       - name: CGL
         run: composer t3g:cgl