Fixes for tests

This commit is contained in:
David Bomba 2021-02-04 19:54:15 +11:00
parent 07ade9099b
commit 98894039bf
2 changed files with 17 additions and 19 deletions

View File

@ -7,11 +7,11 @@ MULTI_DB_ENABLED=false
# database # database
DB_CONNECTION=db-ninja-01 DB_CONNECTION=db-ninja-01
DB_DATABASE1=ninja DB_DATABASE1=ninja
DB_USERNAME1=ninja DB_USERNAME1=root
DB_PASSWORD1=ninja DB_PASSWORD1=ninja
DB_HOST1=127.0.0.1 DB_HOST1=127.0.0.1
DB_DATABASE=ninja DB_DATABASE=ninja
DB_USERNAME=ninja DB_USERNAME=room
DB_PASSWORD=ninja DB_PASSWORD=ninja
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
NINJA_ENVIRONMENT=hosted NINJA_ENVIRONMENT=hosted

View File

@ -1,11 +1,11 @@
on: on:
push: push:
branches: branches:
- v5-develop - v5-develop
pull_request: pull_request:
branches: branches:
- v5-develop - v5-develop
name: phpunit name: phpunit
jobs: jobs:
run: run:
@ -13,18 +13,18 @@ jobs:
strategy: strategy:
matrix: matrix:
operating-system: ['ubuntu-18.04', 'ubuntu-20.04'] operating-system: ['ubuntu-18.04', 'ubuntu-20.04']
php-versions: ['7.4'] php-versions: ['7.3', '7.4']
phpunit-versions: ['latest'] phpunit-versions: ['latest']
env: env:
DB_DATABASE1: ninja DB_DATABASE1: ninja
DB_USERNAME1: ninja DB_USERNAME1: root
DB_PASSWORD1: ninja DB_PASSWORD1: ninja
DB_HOST1: '127.0.0.1' DB_HOST1: '127.0.0.1'
DB_DATABASE: ninja DB_DATABASE: ninja
DB_USERNAME: ninja DB_USERNAME: root
DB_PASSWORD: ninja DB_PASSWORD: ninja
DB_HOST: '127.0.0.1' DB_HOST: '127.0.0.1'
BROADCAST_DRIVER: log BROADCAST_DRIVER: log
CACHE_DRIVER: file CACHE_DRIVER: file
QUEUE_CONNECTION: sync QUEUE_CONNECTION: sync
@ -47,12 +47,12 @@ jobs:
MYSQL_DATABASE: ninja MYSQL_DATABASE: ninja
MYSQL_ROOT_PASSWORD: ninja MYSQL_ROOT_PASSWORD: ninja
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
steps: steps:
- name: Start mysql service - name: Start mysql service
run: | run: |
sudo /etc/init.d/mysql start sudo /etc/init.d/mysql start
- name: Verify MariaDB connection - name: Verify MariaDB connection
env: env:
DB_PORT: ${{ job.services.mariadb.ports[3306] }} 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 while ! mysqladmin ping -h"127.0.0.1" -P"$DB_PORT" --silent; do
sleep 1 sleep 1
done done
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: ${{ matrix.php-versions }} php-version: ${{ matrix.php-versions }}
extensions: mysql, mysqlnd, 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 - uses: actions/checkout@v1
with: with:
ref: v5-develop ref: v5-develop
@ -77,33 +77,31 @@ jobs:
- name: Copy .env - name: Copy .env
run: | run: |
cp .env.ci .env cp .env.ci .env
- name: Install composer dependencies - name: Install composer dependencies
run: | run: |
composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }} composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
composer install composer install
- name: Prepare Laravel Application - name: Prepare Laravel Application
run: | run: |
php artisan key:generate php artisan key:generate
php artisan optimize php artisan optimize
php artisan cache:clear php artisan cache:clear
php artisan config:cache php artisan config:cache
- name: Create DB and schemas - name: Create DB and schemas
run: | run: |
mkdir -p database mkdir -p database
touch database/database.sqlite touch database/database.sqlite
- name: Migrate Database - name: Migrate Database
run: | run: |
php artisan migrate:fresh --seed --force && php artisan db:seed --force php artisan migrate:fresh --seed --force && php artisan db:seed --force
- name: Prepare JS/CSS assets - name: Prepare JS/CSS assets
run: | run: |
npm i npm i
npm run production npm run production
- name: Run Testsuite - name: Run Testsuite
run: | run: |
cat .env cat .env