From 938b5b4d1d79e28c22aee79244f2ca8186d85352 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 7 Mar 2021 16:31:51 +0000 Subject: [PATCH] Updated github CI actions for ubuntu 20.04 Squash of: commit 6b7d305e776dcec2103b9e4486f3c57c674d046f Author: Dan Brown Date: Sun Mar 7 16:25:43 2021 +0000 Updated migrations action and added ldap commit 139d87687d3d4d6c2368adb522932469419c848a Author: Dan Brown Date: Sun Mar 7 16:18:55 2021 +0000 Updated mysql user auth commit 326d11e0d3b96bfb2e6ba446ada9cee479d3eb1a Author: Dan Brown Date: Sun Mar 7 16:15:33 2021 +0000 Moved extensions to right place commit aaa1e159ccbf535292615e094bb58ce6488726df Author: Dan Brown Date: Sun Mar 7 16:13:22 2021 +0000 Added php extensions commit 3720324288c974d825ff2a63306a5fbf1c0478ab Author: Dan Brown Date: Sun Mar 7 16:07:37 2021 +0000 Update gh ci branches list for testing commit 4e3a302a5a4480b45d967f398abbe33883b6d0fb Author: Dan Brown Date: Sun Mar 7 16:06:19 2021 +0000 Updated github ci to use ubuntu 20.04 --- .github/workflows/phpunit.yml | 13 ++++++++++--- .github/workflows/test-migrations.yml | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 7646f0687..fbe3cca7b 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -5,6 +5,7 @@ on: branches: - master - release + - gh_actions_update pull_request: branches: - '*' @@ -13,13 +14,19 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: - php: [7.2, 7.4] + php: [7.2, 7.3, 7.4] steps: - uses: actions/checkout@v1 + - name: Setup PHP + uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8 + with: + php-version: ${{ matrix.php }} + extensions: gd, mbstring, json, curl, xml, mysql, ldap + - name: Get Composer Cache Directory id: composer-cache run: | @@ -38,7 +45,7 @@ jobs: - name: Setup Database run: | mysql -uroot -proot -e 'CREATE DATABASE IF NOT EXISTS `bookstack-test`;' - mysql -uroot -proot -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED BY 'bookstack-test';" + mysql -uroot -proot -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED WITH mysql_native_password BY 'bookstack-test';" mysql -uroot -proot -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';" mysql -uroot -proot -e 'FLUSH PRIVILEGES;' diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml index bff6f70d1..dbeb7b11f 100644 --- a/.github/workflows/test-migrations.yml +++ b/.github/workflows/test-migrations.yml @@ -5,6 +5,7 @@ on: branches: - master - release + - gh_actions_update pull_request: branches: - '*' @@ -13,13 +14,19 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: - php: [7.2, 7.4] + php: [7.2, 7.3, 7.4] steps: - uses: actions/checkout@v1 + - name: Setup PHP + uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8 + with: + php-version: ${{ matrix.php }} + extensions: gd, mbstring, json, curl, xml, mysql, ldap + - name: Get Composer Cache Directory id: composer-cache run: | @@ -38,7 +45,7 @@ jobs: - name: Create database & user run: | mysql -uroot -proot -e 'CREATE DATABASE IF NOT EXISTS `bookstack-test`;' - mysql -uroot -proot -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED BY 'bookstack-test';" + mysql -uroot -proot -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED WITH mysql_native_password BY 'bookstack-test';" mysql -uroot -proot -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';" mysql -uroot -proot -e 'FLUSH PRIVILEGES;'