From a14d2c44a15be4a34fbc2f9fb1309dfa3437be22 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Tue, 19 Jul 2022 13:33:24 +0200
Subject: [PATCH] wip

---
 .github/workflows/main.yml      | 16 +++++++---------
 .github/workflows/run-tests.yml | 11 -----------
 phpunit.xml                     |  1 +
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 23a280f..d0bfead 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,12 +3,12 @@ name: Run tests & build files
 on:
   push:
     branches:
-      - main-prepare
+      - master
 
 jobs:
   test:
     name: Run tests
-    uses: ploi-deploy/ploi-core/.github/workflows/run-tests.yml@main-prepare
+    uses: ploi-deploy/ploi-core/.github/workflows/run-tests.yml@master
 
   deploy:
     needs: test
@@ -31,16 +31,14 @@ jobs:
           node-version: '12.x'
       - run: npm install
       - run: rm -f public/mix-manifest.json
-      - run: npm run prod --section=frontend
-      - run: npm run prod --section=admin
+      - run: npm run prod
 
       - name: Commit build assets
         run: |
           git config --local user.email "actions@github.com"
           git config --local user.name "GitHub Actions"
-          git checkout -B main-files main-prepare
-          git add -f public/
+          git checkout -B master-files master
           git commit -m "Run Laravel Mix en build front-end assets"
-          git checkout -B main
-          git merge main-files
-          git push -f origin main
+          git checkout -B master
+          git merge master-files
+          git push origin master
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index cf9f2a4..abf36c1 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -8,17 +8,6 @@ jobs:
   test:
     name: PHPUnit
     runs-on: ubuntu-latest
-    services:
-      mysql:
-        image: mysql:latest
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: false
-          MYSQL_ROOT_PASSWORD: password
-          MYSQL_DATABASE: XXX
-        ports:
-          - 3306/tcp
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
diff --git a/phpunit.xml b/phpunit.xml
index ee1c983..fe4e8b7 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -14,6 +14,7 @@
     </testsuite>
   </testsuites>
   <php>
+    <server name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
     <server name="APP_ENV" value="testing"/>
     <server name="BCRYPT_ROUNDS" value="4"/>
     <server name="CACHE_DRIVER" value="array"/>