From d0d7bd0e9e262b088929eb05bac42d870fe91aa7 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 13:29:26 +1100 Subject: [PATCH 01/30] Fixes for tests --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index b6f99dfacd6e..c37ed5eb1b61 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -18,7 +18,7 @@ jobs: env: DB_DATABASE1: ninja - DB_USERNAME1: root + DB_USERNAME1: ninja DB_PASSWORD1: ninja DB_HOST1: '127.0.0.1' DB_DATABASE: ninja From b4ed4d4e090ea5347b5208e641052a9261501a66 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 13:32:42 +1100 Subject: [PATCH 02/30] Fixes for tests --- .env.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.ci b/.env.ci index 0d25250e49b7..901f9c549bf3 100644 --- a/.env.ci +++ b/.env.ci @@ -7,7 +7,7 @@ MULTI_DB_ENABLED=false # database DB_CONNECTION=db-ninja-01 DB_DATABASE1=ninja -DB_USERNAME1=root +DB_USERNAME1=ninja DB_PASSWORD1=ninja DB_HOST1=127.0.0.1 DB_DATABASE=ninja From bce75dbc8acf46471d89a1ff26e274ac52585b15 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 13:48:05 +1100 Subject: [PATCH 03/30] Fixes for tests --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index c37ed5eb1b61..b6f99dfacd6e 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -18,7 +18,7 @@ jobs: env: DB_DATABASE1: ninja - DB_USERNAME1: ninja + DB_USERNAME1: root DB_PASSWORD1: ninja DB_HOST1: '127.0.0.1' DB_DATABASE: ninja From 8b3696cbad87ceaa356db3b2182b4af1f71552f1 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 13:57:09 +1100 Subject: [PATCH 04/30] Fixes for tests --- .github/workflows/phpunit.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index b6f99dfacd6e..2bc0964a3e08 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -20,11 +20,11 @@ jobs: DB_DATABASE1: ninja DB_USERNAME1: root DB_PASSWORD1: ninja - DB_HOST1: '127.0.0.1' + DB_HOST1: 'localhost' DB_DATABASE: ninja DB_USERNAME: root DB_PASSWORD: ninja - DB_HOST: '127.0.0.1' + DB_HOST: 'localhost' BROADCAST_DRIVER: log CACHE_DRIVER: file QUEUE_CONNECTION: sync @@ -67,7 +67,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} - extensions: mysql, sqlite3, bcmath, gmp, gd, curl, zip, openssl, mbstring, xml + extensions: mysql, mysqlnd, sqlite3, bcmath, gmp, gd, curl, zip, openssl, mbstring, xml - uses: actions/checkout@v1 with: From 1e0ba1eef6ff9508737e23fc58ac51c65886f294 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 19:40:40 +1100 Subject: [PATCH 05/30] Fixes for tests --- .env.ci | 2 +- .github/workflows/phpunit.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.ci b/.env.ci index 901f9c549bf3..2578a5c57993 100644 --- a/.env.ci +++ b/.env.ci @@ -11,7 +11,7 @@ DB_USERNAME1=ninja DB_PASSWORD1=ninja DB_HOST1=127.0.0.1 DB_DATABASE=ninja -DB_USERNAME=root +DB_USERNAME=ninja DB_PASSWORD=ninja DB_HOST=127.0.0.1 NINJA_ENVIRONMENT=hosted diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 2bc0964a3e08..b32ba802762b 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -18,11 +18,11 @@ jobs: env: DB_DATABASE1: ninja - DB_USERNAME1: root + DB_USERNAME1: ninja DB_PASSWORD1: ninja DB_HOST1: 'localhost' DB_DATABASE: ninja - DB_USERNAME: root + DB_USERNAME: ninja DB_PASSWORD: ninja DB_HOST: 'localhost' BROADCAST_DRIVER: log From 07ade9099be75e04dffee249743e2fcc54266206 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 19:47:20 +1100 Subject: [PATCH 06/30] Fixes for tests --- .github/workflows/phpunit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index b32ba802762b..702ea130e7cd 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -20,11 +20,11 @@ jobs: DB_DATABASE1: ninja DB_USERNAME1: ninja DB_PASSWORD1: ninja - DB_HOST1: 'localhost' + DB_HOST1: '127.0.0.1' DB_DATABASE: ninja DB_USERNAME: ninja DB_PASSWORD: ninja - DB_HOST: 'localhost' + DB_HOST: '127.0.0.1' BROADCAST_DRIVER: log CACHE_DRIVER: file QUEUE_CONNECTION: sync From 98894039bff77d1249809c6cb7c396c5ce113a39 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 19:54:15 +1100 Subject: [PATCH 07/30] Fixes for tests --- .env.ci | 4 ++-- .github/workflows/phpunit.yml | 32 +++++++++++++++----------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.env.ci b/.env.ci index 2578a5c57993..bff7690eba6c 100644 --- a/.env.ci +++ b/.env.ci @@ -7,11 +7,11 @@ MULTI_DB_ENABLED=false # database DB_CONNECTION=db-ninja-01 DB_DATABASE1=ninja -DB_USERNAME1=ninja +DB_USERNAME1=root DB_PASSWORD1=ninja DB_HOST1=127.0.0.1 DB_DATABASE=ninja -DB_USERNAME=ninja +DB_USERNAME=room DB_PASSWORD=ninja DB_HOST=127.0.0.1 NINJA_ENVIRONMENT=hosted diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 702ea130e7cd..0ca585f477d8 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -1,11 +1,11 @@ -on: +on: push: branches: - v5-develop pull_request: - branches: + branches: - v5-develop - + name: phpunit jobs: run: @@ -13,18 +13,18 @@ jobs: strategy: matrix: operating-system: ['ubuntu-18.04', 'ubuntu-20.04'] - php-versions: ['7.4'] + php-versions: ['7.3', '7.4'] phpunit-versions: ['latest'] env: DB_DATABASE1: ninja - DB_USERNAME1: ninja + DB_USERNAME1: root DB_PASSWORD1: ninja DB_HOST1: '127.0.0.1' DB_DATABASE: ninja - DB_USERNAME: ninja + DB_USERNAME: root DB_PASSWORD: ninja - DB_HOST: '127.0.0.1' + DB_HOST: '127.0.0.1' BROADCAST_DRIVER: log CACHE_DRIVER: file QUEUE_CONNECTION: sync @@ -47,12 +47,12 @@ jobs: MYSQL_DATABASE: ninja MYSQL_ROOT_PASSWORD: ninja options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 - + steps: - name: Start mysql service run: | sudo /etc/init.d/mysql start - + - name: Verify MariaDB connection env: DB_PORT: ${{ job.services.mariadb.ports[3306] }} @@ -62,13 +62,13 @@ jobs: while ! mysqladmin ping -h"127.0.0.1" -P"$DB_PORT" --silent; do sleep 1 done - + - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} extensions: mysql, mysqlnd, sqlite3, bcmath, gmp, gd, curl, zip, openssl, mbstring, xml - + - uses: actions/checkout@v1 with: ref: v5-develop @@ -77,33 +77,31 @@ jobs: - name: Copy .env run: | cp .env.ci .env - + - name: Install composer dependencies run: | composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }} composer install - - name: Prepare Laravel Application run: | php artisan key:generate php artisan optimize php artisan cache:clear php artisan config:cache - + - name: Create DB and schemas run: | mkdir -p database touch database/database.sqlite - + - name: Migrate Database run: | php artisan migrate:fresh --seed --force && php artisan db:seed --force - - name: Prepare JS/CSS assets run: | npm i npm run production - + - name: Run Testsuite run: | cat .env From ddd67071cc8dc7ca70121d8f3fb0a775fda5e572 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 19:55:27 +1100 Subject: [PATCH 08/30] Fixes for tests --- .github/workflows/phpunit.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 0ca585f477d8..7fb967fce0a7 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -53,6 +53,11 @@ jobs: run: | sudo /etc/init.d/mysql start + - name: Sleep for 30 seconds //allows time for MySQL to start + uses: jakejarvis/wait-action@master + with: + time: '30s' + - name: Verify MariaDB connection env: DB_PORT: ${{ job.services.mariadb.ports[3306] }} From 8c404644b05747810cf391e0bb8bf4386d252d3e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 20:01:20 +1100 Subject: [PATCH 09/30] Fixes for tests --- .github/workflows/phpunit.yml | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 7fb967fce0a7..701f419a249a 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -1,11 +1,11 @@ -on: +on: push: branches: - v5-develop pull_request: - branches: + branches: - v5-develop - + name: phpunit jobs: run: @@ -13,7 +13,7 @@ jobs: strategy: matrix: operating-system: ['ubuntu-18.04', 'ubuntu-20.04'] - php-versions: ['7.3', '7.4'] + php-versions: ['7.4'] phpunit-versions: ['latest'] env: @@ -24,7 +24,7 @@ jobs: DB_DATABASE: ninja DB_USERNAME: root DB_PASSWORD: ninja - DB_HOST: '127.0.0.1' + DB_HOST: '127.0.0.1' BROADCAST_DRIVER: log CACHE_DRIVER: file QUEUE_CONNECTION: sync @@ -47,13 +47,13 @@ jobs: MYSQL_DATABASE: ninja MYSQL_ROOT_PASSWORD: ninja options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 - + steps: - name: Start mysql service run: | sudo /etc/init.d/mysql start - - - name: Sleep for 30 seconds //allows time for MySQL to start + + - name: Sleep for 30 seconds to allow mysql to start uses: jakejarvis/wait-action@master with: time: '30s' @@ -67,13 +67,12 @@ jobs: while ! mysqladmin ping -h"127.0.0.1" -P"$DB_PORT" --silent; do sleep 1 done - - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} extensions: mysql, mysqlnd, sqlite3, bcmath, gmp, gd, curl, zip, openssl, mbstring, xml - + - uses: actions/checkout@v1 with: ref: v5-develop @@ -82,7 +81,6 @@ jobs: - name: Copy .env run: | cp .env.ci .env - - name: Install composer dependencies run: | composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }} @@ -93,12 +91,10 @@ jobs: php artisan optimize php artisan cache:clear php artisan config:cache - - name: Create DB and schemas run: | mkdir -p database touch database/database.sqlite - - name: Migrate Database run: | php artisan migrate:fresh --seed --force && php artisan db:seed --force @@ -106,7 +102,6 @@ jobs: run: | npm i npm run production - - name: Run Testsuite run: | cat .env @@ -117,4 +112,3 @@ jobs: - name: Run php-cs-fixer run: | vendor/bin/php-cs-fixer fix - From 659b889c095adaad1e1e290e8bdc336b21fc767e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 20:08:03 +1100 Subject: [PATCH 10/30] Fixes for tests --- .env.ci | 2 +- .github/workflows/phpunit.yml | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.env.ci b/.env.ci index bff7690eba6c..0d25250e49b7 100644 --- a/.env.ci +++ b/.env.ci @@ -11,7 +11,7 @@ DB_USERNAME1=root DB_PASSWORD1=ninja DB_HOST1=127.0.0.1 DB_DATABASE=ninja -DB_USERNAME=room +DB_USERNAME=root DB_PASSWORD=ninja DB_HOST=127.0.0.1 NINJA_ENVIRONMENT=hosted diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 701f419a249a..93a0259bb404 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -52,12 +52,7 @@ jobs: - name: Start mysql service run: | sudo /etc/init.d/mysql start - - - name: Sleep for 30 seconds to allow mysql to start - uses: jakejarvis/wait-action@master - with: - time: '30s' - + - name: Verify MariaDB connection env: DB_PORT: ${{ job.services.mariadb.ports[3306] }} From 2475defb38a0d41e52260198f8ba1cdbdc2e3b72 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 20:12:12 +1100 Subject: [PATCH 11/30] Fixes for tests --- .env.ci | 2 +- .github/workflows/phpunit.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.ci b/.env.ci index 0d25250e49b7..901f9c549bf3 100644 --- a/.env.ci +++ b/.env.ci @@ -7,7 +7,7 @@ MULTI_DB_ENABLED=false # database DB_CONNECTION=db-ninja-01 DB_DATABASE1=ninja -DB_USERNAME1=root +DB_USERNAME1=ninja DB_PASSWORD1=ninja DB_HOST1=127.0.0.1 DB_DATABASE=ninja diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 93a0259bb404..5c78ceac07eb 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -18,11 +18,11 @@ jobs: env: DB_DATABASE1: ninja - DB_USERNAME1: root + DB_USERNAME1: ninja DB_PASSWORD1: ninja DB_HOST1: '127.0.0.1' DB_DATABASE: ninja - DB_USERNAME: root + DB_USERNAME: ninja DB_PASSWORD: ninja DB_HOST: '127.0.0.1' BROADCAST_DRIVER: log @@ -52,7 +52,7 @@ jobs: - name: Start mysql service run: | sudo /etc/init.d/mysql start - + - name: Verify MariaDB connection env: DB_PORT: ${{ job.services.mariadb.ports[3306] }} From befb79382d7054737a2eba48e48cdd88e7df21ec Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 20:14:20 +1100 Subject: [PATCH 12/30] Fixes for tests --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 5c78ceac07eb..abaaf3f0a137 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -51,7 +51,7 @@ jobs: steps: - name: Start mysql service run: | - sudo /etc/init.d/mysql start + sudo /etc/init.d/mysql -h 127.0.0.1 start - name: Verify MariaDB connection env: From 629b66f27607c8086ec9d98863457dbd8ab6c149 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 20:16:50 +1100 Subject: [PATCH 13/30] Fixes for tests --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index abaaf3f0a137..5c78ceac07eb 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -51,7 +51,7 @@ jobs: steps: - name: Start mysql service run: | - sudo /etc/init.d/mysql -h 127.0.0.1 start + sudo /etc/init.d/mysql start - name: Verify MariaDB connection env: From ad87b26e18d2be87ddddf426403fc6594870bd98 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 20:18:49 +1100 Subject: [PATCH 14/30] Fixes for tests --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 5c78ceac07eb..76bf58993ea1 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -37,7 +37,7 @@ jobs: services: mariadb: - image: mariadb:latest + image: mysql:5.7 ports: - 3306 env: From 1f5d1c8c806413ffe3b6723db082e9e504bf4604 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 20:27:00 +1100 Subject: [PATCH 15/30] Fixes for tests --- .github/workflows/phpunit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 76bf58993ea1..8d49296cb5cf 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -46,6 +46,7 @@ jobs: MYSQL_PASSWORD: ninja MYSQL_DATABASE: ninja MYSQL_ROOT_PASSWORD: ninja + MYSQL_HOST: 127.0.0.1 options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 steps: From e747bcf18512bdc7c72705b8cb581c855d9ee0de Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 20:32:09 +1100 Subject: [PATCH 16/30] Fixes for tests --- .github/workflows/phpunit.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 8d49296cb5cf..8f4d8dfc5442 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -46,10 +46,10 @@ jobs: MYSQL_PASSWORD: ninja MYSQL_DATABASE: ninja MYSQL_ROOT_PASSWORD: ninja - MYSQL_HOST: 127.0.0.1 options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 steps: + - name: Start mysql service run: | sudo /etc/init.d/mysql start @@ -63,6 +63,7 @@ jobs: while ! mysqladmin ping -h"127.0.0.1" -P"$DB_PORT" --silent; do sleep 1 done + - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -77,22 +78,22 @@ jobs: - name: Copy .env run: | cp .env.ci .env + - name: Install composer dependencies run: | composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }} composer install + - name: Prepare Laravel Application run: | php artisan key:generate php artisan optimize php artisan cache:clear php artisan config:cache - - name: Create DB and schemas - run: | - mkdir -p database - touch database/database.sqlite + - name: Migrate Database run: | + echo 'config("database.connections")' | php artisan tinker php artisan migrate:fresh --seed --force && php artisan db:seed --force - name: Prepare JS/CSS assets run: | From 0c8f27afa91bdc6bea3e8172fe013c01f3322f27 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 20:47:25 +1100 Subject: [PATCH 17/30] Fixes for tests --- .env.ci | 6 +++--- .github/workflows/phpunit.yml | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.env.ci b/.env.ci index 901f9c549bf3..2dad8bee793d 100644 --- a/.env.ci +++ b/.env.ci @@ -7,13 +7,13 @@ MULTI_DB_ENABLED=false # database DB_CONNECTION=db-ninja-01 DB_DATABASE1=ninja -DB_USERNAME1=ninja +DB_USERNAME1=ninja DB_PASSWORD1=ninja -DB_HOST1=127.0.0.1 +DB_HOST1=localhost DB_DATABASE=ninja DB_USERNAME=root DB_PASSWORD=ninja -DB_HOST=127.0.0.1 +DB_HOST=localhost NINJA_ENVIRONMENT=hosted COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}' TRAVIS=true diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 8f4d8dfc5442..3cc3d5439b5a 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -20,11 +20,11 @@ jobs: DB_DATABASE1: ninja DB_USERNAME1: ninja DB_PASSWORD1: ninja - DB_HOST1: '127.0.0.1' + DB_HOST1: 'localhost' DB_DATABASE: ninja DB_USERNAME: ninja DB_PASSWORD: ninja - DB_HOST: '127.0.0.1' + DB_HOST: 'localhost' BROADCAST_DRIVER: log CACHE_DRIVER: file QUEUE_CONNECTION: sync @@ -93,7 +93,6 @@ jobs: - name: Migrate Database run: | - echo 'config("database.connections")' | php artisan tinker php artisan migrate:fresh --seed --force && php artisan db:seed --force - name: Prepare JS/CSS assets run: | From a12906e5023bf3c0d32dad9b4d81be52ae0de276 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 20:51:12 +1100 Subject: [PATCH 18/30] Fixes for tests --- .env.ci | 2 +- .github/workflows/phpunit.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.ci b/.env.ci index 2dad8bee793d..974091c2f7dc 100644 --- a/.env.ci +++ b/.env.ci @@ -7,7 +7,7 @@ MULTI_DB_ENABLED=false # database DB_CONNECTION=db-ninja-01 DB_DATABASE1=ninja -DB_USERNAME1=ninja +DB_USERNAME1=root DB_PASSWORD1=ninja DB_HOST1=localhost DB_DATABASE=ninja diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 3cc3d5439b5a..ff349337dd53 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -18,11 +18,11 @@ jobs: env: DB_DATABASE1: ninja - DB_USERNAME1: ninja + DB_USERNAME1: root DB_PASSWORD1: ninja DB_HOST1: 'localhost' DB_DATABASE: ninja - DB_USERNAME: ninja + DB_USERNAME: root DB_PASSWORD: ninja DB_HOST: 'localhost' BROADCAST_DRIVER: log @@ -42,7 +42,7 @@ jobs: - 3306 env: MYSQL_ALLOW_EMPTY_PASSWORD: yes - MYSQL_USER: ninja + MYSQL_USER: root MYSQL_PASSWORD: ninja MYSQL_DATABASE: ninja MYSQL_ROOT_PASSWORD: ninja From 13df416957baff371d03df3aa2f4a8e51b45998b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 20:59:30 +1100 Subject: [PATCH 19/30] Fixes for tests --- .github/workflows/phpunit.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index ff349337dd53..bbfb97525965 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -20,11 +20,11 @@ jobs: DB_DATABASE1: ninja DB_USERNAME1: root DB_PASSWORD1: ninja - DB_HOST1: 'localhost' + DB_HOST1: '127.0.0.1' DB_DATABASE: ninja DB_USERNAME: root DB_PASSWORD: ninja - DB_HOST: 'localhost' + DB_HOST: '127.0.0.1' BROADCAST_DRIVER: log CACHE_DRIVER: file QUEUE_CONNECTION: sync @@ -37,23 +37,21 @@ jobs: services: mariadb: - image: mysql:5.7 + image: mariadb:latest ports: - 3306 env: MYSQL_ALLOW_EMPTY_PASSWORD: yes - MYSQL_USER: root + MYSQL_USER: ninja MYSQL_PASSWORD: ninja MYSQL_DATABASE: ninja MYSQL_ROOT_PASSWORD: ninja options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 steps: - - name: Start mysql service run: | sudo /etc/init.d/mysql start - - name: Verify MariaDB connection env: DB_PORT: ${{ job.services.mariadb.ports[3306] }} @@ -63,12 +61,11 @@ jobs: while ! mysqladmin ping -h"127.0.0.1" -P"$DB_PORT" --silent; do sleep 1 done - - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} - extensions: mysql, mysqlnd, sqlite3, bcmath, gmp, gd, curl, zip, openssl, mbstring, xml + extensions: mysql, sqlite3, bcmath, gmp, gd, curl, zip, openssl, mbstring, xml - uses: actions/checkout@v1 with: @@ -78,19 +75,17 @@ jobs: - name: Copy .env run: | cp .env.ci .env - - name: Install composer dependencies run: | composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }} composer install - - name: Prepare Laravel Application run: | php artisan key:generate php artisan optimize php artisan cache:clear php artisan config:cache - + - name: Migrate Database run: | php artisan migrate:fresh --seed --force && php artisan db:seed --force From 4b2ecfce254c12103c32cf6827465cc8adccd654 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 21:04:51 +1100 Subject: [PATCH 20/30] Fixes for tests --- .github/workflows/phpunit.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index bbfb97525965..0dc433ae4f2e 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -20,11 +20,11 @@ jobs: DB_DATABASE1: ninja DB_USERNAME1: root DB_PASSWORD1: ninja - DB_HOST1: '127.0.0.1' + DB_HOST1: localhost DB_DATABASE: ninja DB_USERNAME: root DB_PASSWORD: ninja - DB_HOST: '127.0.0.1' + DB_HOST: localhost BROADCAST_DRIVER: log CACHE_DRIVER: file QUEUE_CONNECTION: sync @@ -82,9 +82,9 @@ jobs: - name: Prepare Laravel Application run: | php artisan key:generate - php artisan optimize php artisan cache:clear php artisan config:cache + php artisan optimize - name: Migrate Database run: | From e33cc31513105fdfc85bc9792640fe53b13ca7d1 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 21:10:47 +1100 Subject: [PATCH 21/30] Fixes for tests --- .env.ci | 2 -- .github/workflows/phpunit.yml | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.env.ci b/.env.ci index 974091c2f7dc..a03f48a667cc 100644 --- a/.env.ci +++ b/.env.ci @@ -9,11 +9,9 @@ DB_CONNECTION=db-ninja-01 DB_DATABASE1=ninja DB_USERNAME1=root DB_PASSWORD1=ninja -DB_HOST1=localhost DB_DATABASE=ninja DB_USERNAME=root DB_PASSWORD=ninja -DB_HOST=localhost NINJA_ENVIRONMENT=hosted COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}' TRAVIS=true diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 0dc433ae4f2e..1286b767a370 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -20,11 +20,9 @@ jobs: DB_DATABASE1: ninja DB_USERNAME1: root DB_PASSWORD1: ninja - DB_HOST1: localhost DB_DATABASE: ninja DB_USERNAME: root DB_PASSWORD: ninja - DB_HOST: localhost BROADCAST_DRIVER: log CACHE_DRIVER: file QUEUE_CONNECTION: sync @@ -39,7 +37,7 @@ jobs: mariadb: image: mariadb:latest ports: - - 3306 + - 3306/tcp env: MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_USER: ninja From 589d2bb9a82b80e408113886e072d77a2cfea560 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 21:17:00 +1100 Subject: [PATCH 22/30] Fixes for tests --- .github/workflows/phpunit.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 1286b767a370..49e91a3299fd 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -47,9 +47,11 @@ jobs: options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 steps: + - name: Start mysql service run: | sudo /etc/init.d/mysql start + - name: Verify MariaDB connection env: DB_PORT: ${{ job.services.mariadb.ports[3306] }} @@ -59,6 +61,11 @@ jobs: while ! mysqladmin ping -h"127.0.0.1" -P"$DB_PORT" --silent; do sleep 1 done + + - name: Verify MySQL connection from container + run: | + mysql --host mysql -uroot -pninja -e "SHOW DATABASES" + - name: Setup PHP uses: shivammathur/setup-php@v2 with: From 60f59574a7f964f30181fa37aa1a4893f5bf1ccb Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 21:19:31 +1100 Subject: [PATCH 23/30] Fixes for tests --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 49e91a3299fd..43abe2974dc1 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -64,7 +64,7 @@ jobs: - name: Verify MySQL connection from container run: | - mysql --host mysql -uroot -pninja -e "SHOW DATABASES" + mysql -uroot -pninja -e "SHOW DATABASES" - name: Setup PHP uses: shivammathur/setup-php@v2 From 9444c4d3f360ea231b04890728efea923101c3b3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 21:22:40 +1100 Subject: [PATCH 24/30] Fixes for tests --- .github/workflows/phpunit.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 43abe2974dc1..c33496b623c0 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -18,10 +18,10 @@ jobs: env: DB_DATABASE1: ninja - DB_USERNAME1: root + DB_USERNAME1: ninja DB_PASSWORD1: ninja DB_DATABASE: ninja - DB_USERNAME: root + DB_USERNAME: ninja DB_PASSWORD: ninja BROADCAST_DRIVER: log CACHE_DRIVER: file @@ -64,7 +64,7 @@ jobs: - name: Verify MySQL connection from container run: | - mysql -uroot -pninja -e "SHOW DATABASES" + mysql -uninja -pninja -e "SHOW DATABASES" - name: Setup PHP uses: shivammathur/setup-php@v2 From cb7d51a496bad6920b578542ff8635c234a6777c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 21:26:05 +1100 Subject: [PATCH 25/30] Fixes for tests --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index c33496b623c0..d3452492ed38 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -64,7 +64,7 @@ jobs: - name: Verify MySQL connection from container run: | - mysql -uninja -pninja -e "SHOW DATABASES" + mysql -h"127.0.0.1" -uninja -pninja -e "SHOW DATABASES" - name: Setup PHP uses: shivammathur/setup-php@v2 From 2f02b17ab936fd6d84f5ed925aad705938421fda Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 21:30:50 +1100 Subject: [PATCH 26/30] Fixes for tests --- .github/workflows/phpunit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index d3452492ed38..f5a333161701 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -64,13 +64,13 @@ jobs: - name: Verify MySQL connection from container run: | - mysql -h"127.0.0.1" -uninja -pninja -e "SHOW DATABASES" + mysql -h"localhost" -uninja -pninja -e "SHOW DATABASES" - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} - extensions: mysql, sqlite3, bcmath, gmp, gd, curl, zip, openssl, mbstring, xml + extensions: mysql, mysqlnd, sqlite3, bcmath, gmp, gd, curl, zip, openssl, mbstring, xml - uses: actions/checkout@v1 with: From 677090914ddba645c09a5a4d2e85a9b20cae9469 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 21:36:39 +1100 Subject: [PATCH 27/30] Fixes for tests --- .github/workflows/phpunit.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index f5a333161701..97c7ffa78c57 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -23,6 +23,7 @@ jobs: DB_DATABASE: ninja DB_USERNAME: ninja DB_PASSWORD: ninja + DB_PORT: 32574 BROADCAST_DRIVER: log CACHE_DRIVER: file QUEUE_CONNECTION: sync @@ -37,7 +38,7 @@ jobs: mariadb: image: mariadb:latest ports: - - 3306/tcp + - 32574:3306 env: MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_USER: ninja @@ -64,7 +65,7 @@ jobs: - name: Verify MySQL connection from container run: | - mysql -h"localhost" -uninja -pninja -e "SHOW DATABASES" + mysql -h"localhost" --port 32574 -uninja -pninja -e "SHOW DATABASES" - name: Setup PHP uses: shivammathur/setup-php@v2 From e06403edbafc81f714a2539ffdd15b5e83caf71d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 21:45:11 +1100 Subject: [PATCH 28/30] Fixes for tests --- .env.ci | 8 ++++++-- .github/workflows/phpunit.yml | 25 +++++++++++-------------- app/Jobs/Util/Import.php | 5 +++-- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.env.ci b/.env.ci index a03f48a667cc..486d20cfd0f1 100644 --- a/.env.ci +++ b/.env.ci @@ -7,12 +7,16 @@ MULTI_DB_ENABLED=false # database DB_CONNECTION=db-ninja-01 DB_DATABASE1=ninja -DB_USERNAME1=root +DB_USERNAME1=root DB_PASSWORD1=ninja +DB_HOST1=127.0.0.1 +DB_PORT1=32768 +DB_PORT=32768 DB_DATABASE=ninja DB_USERNAME=root DB_PASSWORD=ninja +DB_HOST=127.0.0.1 NINJA_ENVIRONMENT=hosted COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}' TRAVIS=true -API_SECRET=superdoopersecrethere +API_SECRET=superdoopersecrethere \ No newline at end of file diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 97c7ffa78c57..c89ece0d3c87 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -18,12 +18,13 @@ jobs: env: DB_DATABASE1: ninja - DB_USERNAME1: ninja + DB_USERNAME1: root DB_PASSWORD1: ninja + DB_HOST1: '127.0.0.1' DB_DATABASE: ninja - DB_USERNAME: ninja + DB_USERNAME: root DB_PASSWORD: ninja - DB_PORT: 32574 + DB_HOST: '127.0.0.1' BROADCAST_DRIVER: log CACHE_DRIVER: file QUEUE_CONNECTION: sync @@ -38,7 +39,7 @@ jobs: mariadb: image: mariadb:latest ports: - - 32574:3306 + - 3306 env: MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_USER: ninja @@ -48,11 +49,9 @@ jobs: options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 steps: - - name: Start mysql service run: | sudo /etc/init.d/mysql start - - name: Verify MariaDB connection env: DB_PORT: ${{ job.services.mariadb.ports[3306] }} @@ -62,11 +61,6 @@ jobs: while ! mysqladmin ping -h"127.0.0.1" -P"$DB_PORT" --silent; do sleep 1 done - - - name: Verify MySQL connection from container - run: | - mysql -h"localhost" --port 32574 -uninja -pninja -e "SHOW DATABASES" - - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -88,10 +82,13 @@ jobs: - name: Prepare Laravel Application run: | php artisan key:generate + php artisan optimize php artisan cache:clear php artisan config:cache - php artisan optimize - + - name: Create DB and schemas + run: | + mkdir -p database + touch database/database.sqlite - name: Migrate Database run: | php artisan migrate:fresh --seed --force && php artisan db:seed --force @@ -108,4 +105,4 @@ jobs: - name: Run php-cs-fixer run: | - vendor/bin/php-cs-fixer fix + vendor/bin/php-cs-fixer fix \ No newline at end of file diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index b100e457712b..fdb5e32890f8 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -897,8 +897,9 @@ class Import implements ShouldQueue if ($this->tryTransformingId('invoices', $invoice['invoice_id'])) { $modified['invoices'][$key]['invoice_id'] = $this->transformId('invoices', $invoice['invoice_id']); } else { - $modified['credits'][$key]['credit_id'] = $this->transformId('credits', $invoice['invoice_id']); - $modified['credits'][$key]['amount'] = $modified['invoices'][$key]['amount']; + nlog($modified['invoices']); + // $modified['credits'][$key]['credit_id'] = $this->transformId('credits', $invoice['invoice_id']); + // $modified['credits'][$key]['amount'] = $modified['invoices'][$key]['amount']; } } } From 8b0ebb29e7caf1100b302f3b04628008272cd85c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 21:51:09 +1100 Subject: [PATCH 29/30] Fixes for tests --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index c89ece0d3c87..dc58add47c87 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -39,7 +39,7 @@ jobs: mariadb: image: mariadb:latest ports: - - 3306 + - 32768:3306 env: MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_USER: ninja From e918d8243e3dc74e89d100c267ed900922914a46 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 4 Feb 2021 22:48:01 +1100 Subject: [PATCH 30/30] Fixes for default template --- app/DataMapper/EmailTemplateDefaults.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php index 42ed6930dbeb..b5f904cf4a88 100644 --- a/app/DataMapper/EmailTemplateDefaults.php +++ b/app/DataMapper/EmailTemplateDefaults.php @@ -224,8 +224,7 @@ class EmailTemplateDefaults private static function transformText($string) { //preformat the string, removing trailing colons. - $string = rtrim($string, ":"); - return str_replace(':', '$', ctrans('texts.'.$string)); + return str_replace(':', '$', rtrim( ctrans('texts.'.$string), ":")); } }