From 9f2da5c8409cbf3d5412d9d062401f23a107b0f6 Mon Sep 17 00:00:00 2001 From: Dave Roverts Date: Tue, 6 Feb 2024 20:24:29 +0100 Subject: [PATCH 1/4] ci: add composer stability matrix --- .github/workflows/ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7d9d3c0..159e7917 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ -# GitHub Action for Laravel with MySQL name: CI + on: push: branches: [main] @@ -7,7 +7,7 @@ on: branches: [main] jobs: test-php-mysql: - name: Test PHP ${{ matrix.php-versions }} + Node ${{ matrix.node }} with MySQL + name: Test PHP ${{ matrix.php-versions }} (${{ matrix.stability }}) + Node ${{ matrix.node }} with MySQL runs-on: ubuntu-latest env: DB_DATABASE: laravel @@ -37,6 +37,7 @@ jobs: matrix: php-versions: ["8.2", "8.3"] node: [16, 18, 20] + stability: [prefer-lowest, prefer-stable] steps: - name: Checkout uses: actions/checkout@v3 @@ -88,8 +89,9 @@ jobs: - name: Copy/Paste Detector run: phpcpd app/ --min-lines=50 + test-php-postgresql: - name: Test PHP ${{ matrix.php-versions }} + Node ${{ matrix.node }} with PostgreSQL + name: Test PHP ${{ matrix.php-versions }} (${{ matrix.stability }}) + Node ${{ matrix.node }} with PostgreSQL runs-on: ubuntu-latest env: BROADCAST_DRIVER: log @@ -121,6 +123,7 @@ jobs: matrix: php-versions: ["8.2", "8.3"] node: [16, 18, 20] + stability: [prefer-lowest, prefer-stable] steps: - name: Checkout uses: actions/checkout@v3 From ceb673a09c74c7f64af75f749f434e01efc3ae14 Mon Sep 17 00:00:00 2001 From: Dave Roverts Date: Tue, 6 Feb 2024 20:30:15 +0100 Subject: [PATCH 2/4] ci: add tests on windows --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 159e7917..57b0ad98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: branches: [main] jobs: test-php-mysql: - name: Test PHP ${{ matrix.php-versions }} (${{ matrix.stability }}) + Node ${{ matrix.node }} with MySQL + name: Test PHP ${{ matrix.php-versions }} (${{ matrix.stability }}) + Node ${{ matrix.node }} + ${{ matrix.os }} with MySQL runs-on: ubuntu-latest env: DB_DATABASE: laravel @@ -38,6 +38,7 @@ jobs: php-versions: ["8.2", "8.3"] node: [16, 18, 20] stability: [prefer-lowest, prefer-stable] + os: [ubuntu-latest, windows-latest] steps: - name: Checkout uses: actions/checkout@v3 @@ -91,7 +92,7 @@ jobs: run: phpcpd app/ --min-lines=50 test-php-postgresql: - name: Test PHP ${{ matrix.php-versions }} (${{ matrix.stability }}) + Node ${{ matrix.node }} with PostgreSQL + name: Test PHP ${{ matrix.php-versions }} (${{ matrix.stability }}) + Node ${{ matrix.node }} + ${{ matrix.os }} with PostgreSQL runs-on: ubuntu-latest env: BROADCAST_DRIVER: log @@ -124,6 +125,7 @@ jobs: php-versions: ["8.2", "8.3"] node: [16, 18, 20] stability: [prefer-lowest, prefer-stable] + os: [ubuntu-latest, windows-latest] steps: - name: Checkout uses: actions/checkout@v3 From 111e5f4eea49f0c669c7787168f22e419fa9331e Mon Sep 17 00:00:00 2001 From: Dave Roverts Date: Tue, 6 Feb 2024 20:44:26 +0100 Subject: [PATCH 3/4] chore: comment out creating eham during migration most people use import script anyways --- database/migrations/2018_06_06_172719_create_airports_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2018_06_06_172719_create_airports_table.php b/database/migrations/2018_06_06_172719_create_airports_table.php index 74cb0960..5ab949e7 100644 --- a/database/migrations/2018_06_06_172719_create_airports_table.php +++ b/database/migrations/2018_06_06_172719_create_airports_table.php @@ -21,7 +21,7 @@ public function up() $table->string('name'); $table->timestamps(); }); - DB::table('airports')->insert(['icao' => 'EHAM', 'iata' => 'AMS', 'name' => 'Amsterdam Airport Schiphol']); + // DB::table('airports')->insert(['icao' => 'EHAM', 'iata' => 'AMS', 'name' => 'Amsterdam Airport Schiphol']); } /** From d188af631c9c500c4e29705aeb0ac8dcc01a1bad Mon Sep 17 00:00:00 2001 From: Dave Roverts Date: Tue, 6 Feb 2024 20:54:56 +0100 Subject: [PATCH 4/4] ci: add beta and alpha branches to ci --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57b0ad98..ebbefce1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [main] + branches: [main, beta, alpha] pull_request: - branches: [main] + branches: [main, beta, alpha] jobs: test-php-mysql: name: Test PHP ${{ matrix.php-versions }} (${{ matrix.stability }}) + Node ${{ matrix.node }} + ${{ matrix.os }} with MySQL