From a0b0cfac170671dfd68553c0486f45e747cc324d Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 14:33:29 +0300 Subject: [PATCH 01/12] fix: deployer --- .github/workflows/deploy_release.yml | 2 +- .github/workflows/deploy_staging.yml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_release.yml b/.github/workflows/deploy_release.yml index 44abf944..f01f12a5 100644 --- a/.github/workflows/deploy_release.yml +++ b/.github/workflows/deploy_release.yml @@ -18,7 +18,7 @@ defaults: working-directory: app jobs: - integration: + deployment: runs-on: "ubuntu-22.04" strategy: fail-fast: true diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index eb2603e1..db2ffe1e 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -1,9 +1,15 @@ --- on: # yamllint disable-line rule:truthy +# push: +# branches: +# - develop push: branches: - develop + pull_request: + branches: + - develop name: 📦 Deploy to staging @@ -12,7 +18,7 @@ defaults: working-directory: app jobs: - integration: + deployment: runs-on: "ubuntu-22.04" strategy: fail-fast: true From 1b8329d12e4766b4c31159f5da858c79e574b363 Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 16:27:37 +0300 Subject: [PATCH 02/12] fix: deployer --- .github/workflows/deploy_release.yml | 2 +- .github/workflows/deploy_staging.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_release.yml b/.github/workflows/deploy_release.yml index f01f12a5..b9d76d7c 100644 --- a/.github/workflows/deploy_release.yml +++ b/.github/workflows/deploy_release.yml @@ -33,7 +33,7 @@ jobs: - name: 🛠️ Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: "8.2" + php-version: "8.1" ini-values: error_reporting=E_ALL tools: composer:v2 diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index db2ffe1e..f1b1246a 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -33,7 +33,7 @@ jobs: - name: 🛠️ Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: "8.2" + php-version: "8.1" ini-values: error_reporting=E_ALL tools: composer:v2 From 7f9c078bd5140a0bf8291b6bfb4375547fd9c9fb Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 16:30:50 +0300 Subject: [PATCH 03/12] chore: debug deployer --- .github/workflows/deploy_release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/deploy_release.yml b/.github/workflows/deploy_release.yml index b9d76d7c..aedcfd53 100644 --- a/.github/workflows/deploy_release.yml +++ b/.github/workflows/deploy_release.yml @@ -48,6 +48,12 @@ jobs: if: steps.cached-composer-dependencies.outputs.cache-hit != 'true' run: composer install + - name: ls + run: | + ls -la + ls -la vendor + ls -la vendor/bin + - name: 📤 Deploy production environment uses: deployphp/action@v1 with: From 3a01f8423d7665963db7df2f99d135c14501806c Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 16:32:42 +0300 Subject: [PATCH 04/12] chore: debug deployer --- .github/workflows/deploy_staging.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index f1b1246a..152001b4 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -48,6 +48,12 @@ jobs: if: steps.cached-composer-dependencies.outputs.cache-hit != 'true' run: composer install + - name: ls + run: | + ls -la + ls -la vendor + ls -la vendor/bin + - name: 📤 Deploy staging environment uses: deployphp/action@v1 with: From 300515ef84d674d3b308888ba74ac41bdfe2daa3 Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 16:36:08 +0300 Subject: [PATCH 05/12] chore: debug deployer --- .github/workflows/deploy_staging.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index 152001b4..a44b5f0d 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -59,6 +59,7 @@ jobs: with: private-key: ${{ secrets.DEPLOYER_PRIVATE_KEY }} dep: deploy staging + deployer-binary: "vendor/bin/dep" env: DEPLOYER_STAGING_SLACK_WEBHOOK: ${{ secrets.DEPLOYER_STAGING_SLACK_WEBHOOK }} DEPLOYER_STAGING_REMOTE_USER: ${{ secrets.DEPLOYER_STAGING_REMOTE_USER }} From f6b90ba8ac89769da901ec8ecce3ba0c1c5d024d Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 16:38:59 +0300 Subject: [PATCH 06/12] chore: debug deployer --- .github/workflows/deploy_staging.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index a44b5f0d..f40aacd5 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -37,15 +37,7 @@ jobs: ini-values: error_reporting=E_ALL tools: composer:v2 - - name: ♻️ Restore cached backend dependencies - id: cached-composer-dependencies - uses: actions/cache@v3 - with: - path: vendor - key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }} - - name: 📥 Install backend dependencies - if: steps.cached-composer-dependencies.outputs.cache-hit != 'true' run: composer install - name: ls @@ -59,7 +51,6 @@ jobs: with: private-key: ${{ secrets.DEPLOYER_PRIVATE_KEY }} dep: deploy staging - deployer-binary: "vendor/bin/dep" env: DEPLOYER_STAGING_SLACK_WEBHOOK: ${{ secrets.DEPLOYER_STAGING_SLACK_WEBHOOK }} DEPLOYER_STAGING_REMOTE_USER: ${{ secrets.DEPLOYER_STAGING_REMOTE_USER }} From 00fadf60b75cd497f172208c789aef6e1c8f42fb Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 16:40:15 +0300 Subject: [PATCH 07/12] chore: debug deployer --- .github/workflows/deploy_staging.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index f40aacd5..bf29d451 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -34,6 +34,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: "8.1" + extensions: dom, curl, libxml, mbstring, zip, fileinfo ini-values: error_reporting=E_ALL tools: composer:v2 From 8b08ccaf69936eb680f7ed212d7bca851cc84deb Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 16:42:32 +0300 Subject: [PATCH 08/12] chore: debug deployer --- .github/workflows/deploy_staging.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index bf29d451..b44e5e2e 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -13,9 +13,9 @@ on: # yamllint disable-line rule:truthy name: 📦 Deploy to staging -defaults: - run: - working-directory: app +#defaults: +# run: +# working-directory: app jobs: deployment: @@ -49,6 +49,7 @@ jobs: - name: 📤 Deploy staging environment uses: deployphp/action@v1 + working-directory: ./app with: private-key: ${{ secrets.DEPLOYER_PRIVATE_KEY }} dep: deploy staging From 903adcb17e28a6f7eb08e4185d177a55a66e2b86 Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 16:45:37 +0300 Subject: [PATCH 09/12] chore: debug deployer --- .github/workflows/deploy_staging.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index b44e5e2e..0d7691a1 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -41,18 +41,13 @@ jobs: - name: 📥 Install backend dependencies run: composer install - - name: ls - run: | - ls -la - ls -la vendor - ls -la vendor/bin - - name: 📤 Deploy staging environment uses: deployphp/action@v1 - working-directory: ./app with: private-key: ${{ secrets.DEPLOYER_PRIVATE_KEY }} dep: deploy staging + deployer-version: 7.3.1 + sub-directory: app env: DEPLOYER_STAGING_SLACK_WEBHOOK: ${{ secrets.DEPLOYER_STAGING_SLACK_WEBHOOK }} DEPLOYER_STAGING_REMOTE_USER: ${{ secrets.DEPLOYER_STAGING_REMOTE_USER }} From a3564c30a6a4e0aeefaea0794c41eff0f6de2d45 Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 16:46:52 +0300 Subject: [PATCH 10/12] chore: debug deployer --- .github/workflows/deploy_staging.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index 0d7691a1..9aee0df7 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -13,9 +13,9 @@ on: # yamllint disable-line rule:truthy name: 📦 Deploy to staging -#defaults: -# run: -# working-directory: app +defaults: + run: + working-directory: app jobs: deployment: From 769863c8bf6ef781fc9d2225e17fd96c24de137d Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 16:52:19 +0300 Subject: [PATCH 11/12] chore: debug deployer --- .github/workflows/ci.yml | 2 +- .github/workflows/deploy_staging.yml | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a24f58f..d12abd4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: uses: actions/cache@v3 with: path: vendor - key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }} + key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }} - name: 📥 Install backend dependencies if: steps.cached-composer-dependencies.outputs.cache-hit != 'true' diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index 9aee0df7..299630d9 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -13,15 +13,14 @@ on: # yamllint disable-line rule:truthy name: 📦 Deploy to staging -defaults: - run: - working-directory: app - jobs: deployment: - runs-on: "ubuntu-22.04" + runs-on: ${{ matrix.os }} strategy: fail-fast: true + matrix: + os: ["ubuntu-22.04"] + php: ["8.1"] environment: name: staging url: https://staging.laravel-starter-tpl.wayof.dev @@ -33,13 +32,21 @@ jobs: - name: 🛠️ Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: "8.1" + php-version: ${{ matrix.php }} extensions: dom, curl, libxml, mbstring, zip, fileinfo ini-values: error_reporting=E_ALL tools: composer:v2 + - name: ♻️ Restore cached backend dependencies + id: cached-composer-dependencies + uses: actions/cache@v3 + with: + path: vendor + key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }} + - name: 📥 Install backend dependencies - run: composer install + if: steps.cached-composer-dependencies.outputs.cache-hit != 'true' + run: cd app && composer install - name: 📤 Deploy staging environment uses: deployphp/action@v1 From e15aa2eaf84adf83bb60c1449235ac409065fff2 Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 9 May 2023 17:03:23 +0300 Subject: [PATCH 12/12] fix: deployer actions --- .github/workflows/deploy_release.yml | 35 +++++++++++----------------- .github/workflows/deploy_staging.yml | 6 ----- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/.github/workflows/deploy_release.yml b/.github/workflows/deploy_release.yml index aedcfd53..eb8d84d6 100644 --- a/.github/workflows/deploy_release.yml +++ b/.github/workflows/deploy_release.yml @@ -1,27 +1,23 @@ --- on: # yamllint disable-line rule:truthy + release: + types: + - released push: - branches: - - master - # release: - # types: - # - released - # push: - # tags: - # - 'v*' + tags: + - 'v*' name: 📦 Deploy to production -defaults: - run: - working-directory: app - jobs: deployment: runs-on: "ubuntu-22.04" strategy: fail-fast: true + matrix: + os: ["ubuntu-22.04"] + php: ["8.1"] environment: name: production url: https://prod.laravel-starter-tpl.wayof.dev @@ -33,7 +29,8 @@ jobs: - name: 🛠️ Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: "8.1" + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, fileinfo ini-values: error_reporting=E_ALL tools: composer:v2 @@ -42,23 +39,19 @@ jobs: uses: actions/cache@v3 with: path: vendor - key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }} + key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }} - name: 📥 Install backend dependencies if: steps.cached-composer-dependencies.outputs.cache-hit != 'true' - run: composer install - - - name: ls - run: | - ls -la - ls -la vendor - ls -la vendor/bin + run: cd app && composer install - name: 📤 Deploy production environment uses: deployphp/action@v1 with: private-key: ${{ secrets.DEPLOYER_PRIVATE_KEY }} dep: deploy prod + deployer-version: 7.3.1 + sub-directory: app env: DEPLOYER_STAGING_SLACK_WEBHOOK: ${{ secrets.DEPLOYER_STAGING_SLACK_WEBHOOK }} DEPLOYER_STAGING_REMOTE_USER: ${{ secrets.DEPLOYER_STAGING_REMOTE_USER }} diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index 299630d9..98cf696f 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -1,15 +1,9 @@ --- on: # yamllint disable-line rule:truthy -# push: -# branches: -# - develop push: branches: - develop - pull_request: - branches: - - develop name: 📦 Deploy to staging