Renamed github workflows [SLE-184]

samuelgfeller · Jul 6, 2023 · 3ee0c81 · 3ee0c81
1 parent c9eb4a9
commit 3ee0c81
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/develop.yml → .github/workflows/build.yml b/.github/workflows/develop.yml → .github/workflows/build.yml
diff --git a/.github/workflows/master.yml → .github/workflows/deployment.yml b/.github/workflows/master.yml → .github/workflows/deployment.yml
@@ -1,10 +1,11 @@
 name: 🚀 Deployment
+
+# Only trigger, when the build workflow succeeded
 on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [ opened, synchronize, reopened ]
+  workflow_run:
+    workflows: [ "🧪 Build test" ]
+    types:
+      - completed
 
 jobs:
   run:
@@ -49,7 +50,7 @@ jobs:
             .git*/**
             docs/**
             tests/**
-            
+
       - name: Executing database migrations
         uses: appleboy/[email protected]
         with:
@@ -58,7 +59,7 @@ jobs:
           key: ${{ secrets.SSH_KEY }}
           passphrase: ${{ secrets.SSH_KEY_PASSPHRASE }}
           port: ${{ secrets.SSH_PORT }}
-          script: | 
+          script: |
             cd ${{ secrets.DEMO_PROJECT_ROOT }}
             chmod +x vendor/bin/phinx 
             composer migrate
@@ -86,6 +87,6 @@ jobs:
           passphrase: ${{ secrets.CARE_POINT_SSH_KEY_PASSPHRASE }}
           port: ${{ secrets.CARE_POINT_SSH_PORT }}
           script: |
-           cd ${{ secrets.CARE_POINT_PROJECT_ROOT }}
-           chmod +x vendor/bin/phinx
-           composer migrate
+            cd ${{ secrets.CARE_POINT_PROJECT_ROOT }}
+            chmod +x vendor/bin/phinx
+            composer migrate
diff --git a/composer.json b/composer.json
@@ -18,7 +18,8 @@
     "nyholm/psr7-server": "^1",
     "fig/http-message-util": "^1.1",
     "ext-gettext": "*",
-    "ext-intl": "*"
+    "ext-intl": "*",
+    "php": "^8.1"
   },
   "autoload": {
     "psr-4": {

diff --git a/resources/seeds/AdminUserSeeder.php b/resources/seeds/AdminUserSeeder.php
@@ -32,10 +32,10 @@ public function run(): void
         $userData = [
             [
                 'first_name' => 'Admin',
-                'surname' => null,
+                'surname' => 'Admin',
                 'user_role_id' => 1,
                 'status' => 'active',
-                'email' => 'admin@admin.com',
+                'email' => 'admin@user.com',
                 'password_hash' => '$2y$10$bHOxtOEs/vBsVnzDLqP3oexZp2yi9aO.DvIloFo0/UZAksMn.VBKm', // password: 12345678
             ],
         ];

diff --git a/resources/seeds/UserSeeder.php b/resources/seeds/UserSeeder.php
@@ -33,18 +33,18 @@ public function run(): void
         $userData = [
             [
                 'id' => 2,
-                'first_name' => 'Manager',
-                'surname' => 'Advisor',
+                'first_name' => 'Managing-advisor',
+                'surname' => 'Surname',
                 'user_role_id' => 2,
                 'status' => 'active',
                 'language' => 'en_US',
-                'email' => 'managing@advisor.com',
+                'email' => 'managing-advisor@user.com',
                 'password_hash' => '$2y$10$bHOxtOEs/vBsVnzDLqP3oexZp2yi9aO.DvIloFo0/UZAksMn.VBKm', // password: 12345678
             ],
             [
                 'id' => 3,
                 'first_name' => 'Advisor',
-                'surname' => 'User',
+                'surname' => 'Surname',
                 'user_role_id' => 3,
                 'status' => 'active',
                 'language' => 'de_CH',
@@ -54,7 +54,7 @@ public function run(): void
             [
                 'id' => 4,
                 'first_name' => 'Newcomer',
-                'surname' => 'User',
+                'surname' => 'Surname',
                 'user_role_id' => 4,
                 'status' => 'active',
                 'language' => 'fr_CH',