From 3ee0c81b36cb36a02aacc008d7e4723177464d94 Mon Sep 17 00:00:00 2001 From: Samuel Gfeller Date: Thu, 6 Jul 2023 21:01:45 +0200 Subject: [PATCH] Renamed github workflows [SLE-184] --- .github/workflows/{develop.yml => build.yml} | 0 .../workflows/{master.yml => deployment.yml} | 21 ++++++++++--------- composer.json | 3 ++- resources/seeds/AdminUserSeeder.php | 4 ++-- resources/seeds/UserSeeder.php | 10 ++++----- 5 files changed, 20 insertions(+), 18 deletions(-) rename .github/workflows/{develop.yml => build.yml} (100%) rename .github/workflows/{master.yml => deployment.yml} (90%) diff --git a/.github/workflows/develop.yml b/.github/workflows/build.yml similarity index 100% rename from .github/workflows/develop.yml rename to .github/workflows/build.yml diff --git a/.github/workflows/master.yml b/.github/workflows/deployment.yml similarity index 90% rename from .github/workflows/master.yml rename to .github/workflows/deployment.yml index 6b1deff9..bcc3766e 100644 --- a/.github/workflows/master.yml +++ b/.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/ssh-action@v0.1.6 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 \ No newline at end of file + cd ${{ secrets.CARE_POINT_PROJECT_ROOT }} + chmod +x vendor/bin/phinx + composer migrate \ No newline at end of file diff --git a/composer.json b/composer.json index b9c18f3f..19c6154c 100644 --- 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 index c7855888..4d51f056 100644 --- 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 index 05ec9dd0..6ba688ce 100644 --- 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',