diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml deleted file mode 100644 index 5f6caa6d..00000000 --- a/.github/workflows/continuous-deployment.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Continuous Deployment (CD) - -on: - workflow_run: - workflows: [Continuous Integration (CI)] - types: [completed] - branches: - - develop - - production - - stage - -jobs: - deployment: - name: Deployment - if: ${{ github.event.workflow_run.event == 'push' }} && ${{ github.event.workflow_run.conclusion == 'success' }} - uses: ./.github/workflows/deployment.yml - secrets: - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} - SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index bbcd8481..d05e55d5 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -539,3 +539,13 @@ jobs: name: logs-${{ matrix.php-version }}-${{ matrix.dependencies }} path: var/log retention-days: 7 + + deployment: + name: Deployment + needs: + - tests + if: ${{ github.event_name == 'push' }} + uses: ./.github/workflows/deployment.yml + secrets: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }}