From 3a7e1ecbe3e4753354ddf8420ca101942ab306a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 19 May 2023 07:11:57 +0300 Subject: [PATCH 1/2] Change GHA runner ubuntu-18.04 to ubuntu-20.04 --- .github/workflows/tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bcba3c39..1920368d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,16 +17,16 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-18.04 + - os: ubuntu-20.04 database-version: 'mysql:5.7' php-version: '7.4' - - os: ubuntu-18.04 + - os: ubuntu-20.04 database-version: 'mysql:5.7' php-version: '8.0' - - os: ubuntu-18.04 + - os: ubuntu-20.04 database-version: 'mysql:5.7' php-version: '8.1' - - os: ubuntu-18.04 + - os: ubuntu-20.04 database-version: 'mysql:5.7' php-version: '8.2' - os: ubuntu-latest @@ -41,16 +41,16 @@ jobs: - os: ubuntu-latest database-version: 'mysql:8.0' php-version: '8.2' - - os: ubuntu-18.04 + - os: ubuntu-20.04 database-version: 'mariadb:10.6' php-version: '7.4' - - os: ubuntu-18.04 + - os: ubuntu-20.04 database-version: 'mariadb:10.6' php-version: '8.0' - - os: ubuntu-18.04 + - os: ubuntu-20.04 database-version: 'mariadb:10.6' php-version: '8.1' - - os: ubuntu-18.04 + - os: ubuntu-20.04 database-version: 'mariadb:10.6' php-version: '8.2' From c853c89abfddae10ce44154b87d80fff117f8e0a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 19 May 2023 07:44:16 +0300 Subject: [PATCH 2/2] Use shogo82148/actions-setup-mysql --- .github/workflows/tests.yml | 51 +++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1920368d..7349bf9e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,51 +18,64 @@ jobs: matrix: include: - os: ubuntu-20.04 - database-version: 'mysql:5.7' + database: 'mysql' + database-version: '5.7' php-version: '7.4' - os: ubuntu-20.04 - database-version: 'mysql:5.7' + database: 'mysql' + database-version: '5.7' php-version: '8.0' - os: ubuntu-20.04 - database-version: 'mysql:5.7' + database: 'mysql' + database-version: '5.7' php-version: '8.1' - os: ubuntu-20.04 - database-version: 'mysql:5.7' + database: 'mysql' + database-version: '5.7' php-version: '8.2' - os: ubuntu-latest - database-version: 'mysql:8.0' + database: 'mysql' + database-version: '8.0' php-version: '7.4' - os: ubuntu-latest - database-version: 'mysql:8.0' + database: 'mysql' + database-version: '8.0' php-version: '8.0' - os: ubuntu-latest - database-version: 'mysql:8.0' + database: 'mysql' + database-version: '8.0' php-version: '8.1' - os: ubuntu-latest - database-version: 'mysql:8.0' + database: 'mysql' + database-version: '8.0' php-version: '8.2' - os: ubuntu-20.04 - database-version: 'mariadb:10.6' + database: 'mariadb' + database-version: '10.6' php-version: '7.4' - os: ubuntu-20.04 - database-version: 'mariadb:10.6' + database: 'mariadb' + database-version: '10.6' php-version: '8.0' - os: ubuntu-20.04 - database-version: 'mariadb:10.6' + database: 'mariadb' + database-version: '10.6' php-version: '8.1' - os: ubuntu-20.04 - database-version: 'mariadb:10.6' + database: 'mariadb' + database-version: '10.6' php-version: '8.2' - services: - db: - image: druidfi/${{ matrix.database-version }}-drupal - ports: - - 3306:3306 - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - steps: + - uses: shogo82148/actions-setup-mysql@v1 + with: + distribution: '${{ matrix.database }}' + mysql-version: '${{ matrix.database-version }}' + user: 'travis' + password: '' + root-password: 'drupal' + - name: Checkout code uses: actions/checkout@v3 with: