Change pipeline logic and add zhpcbpdevstore for dev environment (#80)

* Update github actions * Update .env.dev file
itwzhp · Oct 3, 2024 · e8c820c · e8c820c
1 parent 0198a33
commit e8c820c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 35 deletions.
diff --git a/.env.dev.encrypted b/.env.dev.encrypted
@@ -1 +1 @@
-eyJpdiI6Im96bDJCcG1WRnhYY3FzMkFtVHJPSVE9PSIsInZhbHVlIjoiNlAyUWZWaUxBeFRLTUhBQ0hJN2ZXZlNKVkdVYkNQemRJN2JOUUpCa012d01IT2xzR2oxaWljK05FSlF5ZkEyb3d1RktlRS9GTWMxQ2dqMmxpZzlSTFRaTEFZbStPaGZTeTFaWEd0M3lqZzVyK2dRMS9taGZwVzkzMXdULytzQ1JqbVRiZTBNOFprNjJGSFJKUkloMExTQ29RU3BaaS80RGVTekRTblhKY3h5TE1JM25KdUVCQktVUFprQnh5UHlNWEJKNXhUekxUNERQbVVEL3d0dVdGNDk1OHhEV2hrSE9kOVVrV211Ym82RG05ZkY0RmtObkxGN05zcm9oUzM4Q3VtNUpOUjUrcStqUTRkZWdvQzNBU1krcVMxalV0NDZZZWl5N0ZGNkZpdk5GL2RaZ1FtSTJDeGY2emYzL2dRQllhVHp0RWR4RXV3MjN5K3RqcVNYdkJCNFpibEtwQkc4SFZVUE5RK1phUldxNTBRSzNMTnQ0ajV6MytTOUxUMkxGb3lIWmRqbTZpcnc4U0RHbkFMa3djcTF5d3JLSGxpOUlmUUFPOGpFZ0xBZVU3NkhCNCs2QnRXM1B1dG5oSnUzL01SQVVQdCtTMW96VHl0OFg2TXNJQVpFeDhMdithdlQxbEJ0bVFiZ25lTHlRNncxWU51aEwwbjlpd01yeE9ZenR5NW1oUURXdlZoZTF2bXNpVFhNRVVRTDdCc2l3SUZHUWV1SEZuL2FzdWNWNjFjY1RnK2ZtZzN2OVRvZ2VnUkhQZVk1eEdLMTRDdWtEQ0pZeU04aXl6TFA4RDFwV2pEMlRrV29jelBpRjQzMkdpUHRqaDRhR3ljTTh4Skt3MzRxM2h6QzI2anFxOVRkL3FPcnhYdEoyZmpQa2c4Qlp3Szk4TzRCZjhMSlZRQzJQT1prU1J4NStoeTNVRzg5aDA5aXJGVzhCb05BUktPSUNGdFpxRWVjQ1pvUkR6MEZrZ2NCUitvSU50ZVhlbUhWeWZlWUlWbjJrU1NDaldCYUd3aXJVNWhzM1l4blNMODVIcWF3dDlkdlkvOWVwWTJGRkxZZGV2VEFoV00yTDE2RkwwZHVHWnBpQmttY3Z6MmN4clpPSFFSMktKQVVxNlNsWCtLZFN5MmNpaENpaENobXNkV0F5MWYxb3ovY0VYR0ZJSjQrak92Y0dYNjdNQlRJWkV1bEowdk0rcHBLakc5aWR0WkMyNHdGQ3BJV0VTY01iUXFIbk1WeEFRSHY3bEdHSVM2bU1RMDlLR0R3Zk5pYUVzTGU3ZllyOHkySzZ3bDVJbHp2WVMvOEVndTlOVmViNDQycCtDWGhRZ1BzNEZZSWJNK3I4cTVnZGdUbnBIdVRBVVpFTEx2QnFkOFFxQTFSMGtHMU5CdFRzM2hPcUUvc3BZZUVRUlRWV21IdEQrVDByc0Vlck5CSXVNeGE1U2o4amdqQWI1SFJHam9MbGhUdEFEQnVaQkZBaWx0eHZBL3FKMGpNMXgrYVc2UUdYRkVqclhFYXlRTXVzczdaRmhpQ3YzRW44SGxkaXJlazRxaFdtTS9LSlBuenIvRFhqZjdyRFRKaUVKWXl3YTJrVzVSQWtUUU1nMm1wMm9YU3liSm9GdkFSVFJUZjFCS0lPbVZrMndVa3c0d0ZjbkxpRFpIYWw4c2FJWDF4eHZPQmQwWlJDeFp0N0FuT1BGa2VOUndVV1N5aGhuNWQvTVdhMmhoUU93dVBLbVUyNWFTWUFPQnpxRW16OE45aVprRUNnR2haeldEaHJ5bkVhdHRLMkhGdVVRUWk4UkhrWm4zQnhZMkZ6L0lXY2I2NjcrdWQ5UmdSZnRMeEUyRk1UZFo3OFk3czFISExhY0VLTi9YQVQremlaaHlNdjkySkg4T1hsNjMyTDRXalNUSkRySHdiWXQ1anFTSGpyd2F2MHZtQTZ1cEk5bTB0cHJpaWdvZGFhZ2RGUWtIcDBBdk1vVkpuOHBFUkFsRjI5WCtNNmRBdFE5SFN3Y1F4Q2NnVlgyU0E2cDIrVHo5STh4MWVUbTUzZmc0NEttZnUvdG5vRExrUGZDNGhiMVE0dDNqQ3Yza0M5Q1dWb3dLZEY2by9CaUpBZ2lGSUx5ZkMrN2dTd2FXZWJ6aXRXdnBzdnRrd29NQmNOaTR6c1V1V3JtUkxuckVOTkQ3dllqV2k4bzZxZUZJRVJwVXo0enZPT3Fmbk9Ob1N6QTBwNDZ0cjd4V1gvUVRHY3hFcVNnZ2IycElQYkNvcnNiTzBJN1MybXU0K3RVV0hDRW8wcEdZVFlBTDVNYWRaU3FpNUVQMzU4dzhHa2hmK2tDSllsL2VMNXg3cERuWkFjU3NVeU84MlJMSDlhSEw4UUJVUUR6aGl5cm9ST2QrcVorelFMOHVTeE9RN1dlcTc1YUlET3J0a3JHUUxEVXdWbUYweGtRUUI5QURIYkpKRi9PakM0SWdNL2FDMHJ5YytTZUdHUDR2Y3dqeFFkNm9wNHZkMWdaQk1SM2JQRDRFeUFkZ1ZLKzBBcDN1YjVJZ0FudUF0eHhnUmdFMStlcEdTbEN4Q1NMOFFRSkpVckEvakVMQ0ZvaGJvbGp5b0xUdEFOVndwSVN0Y29WZnB1WlJFTlQrOTFTQ2pUOHFjYm91WlhkckYwRWVBdktFcHVrV0Iwemt6ZGFsOFhNR050T21ZWG5uWmFvbWRFNnZ0Y1IyWEU2eWtWK1ZqK0ZOaWNVR1pYc3VIWjRpZUhQNDBXSUpxdEowUEcvME92Ylc1RzBLVWt4Tk1uYVcweTVkd1lUMURvSTBjaWdJNnpuanlNQm4xWDBJVHV0TTdQVUR0dXNKVElFcnFIUk1ycStYOUtEK0h4MG5aT01HVVlKUzdPcHR3M2I0eEJHbmpOWjJOVklxRHpCRXFEUDJ6QVRscXg0RUJ4VGVGVG5BRWlqRWVFSVdKWWlmNDBHdTZ1SDRvZEVuRXpQTEU9IiwibWFjIjoiODRlYmU0NTQ2OGE3M2I5MGFmNmFiZGU3ZjViMzNkMTJmNzk5ZTRiOWMxNTBkYjM1MmQxZjU5MGVkYmRmZmZjYSIsInRhZyI6IiJ9
+eyJpdiI6IkNXY2hGWDFYcStZVitmMElSL1pzUlE9PSIsInZhbHVlIjoiM3kxaHZXcjdJZis2Wk40U01LbmVDdTZ4MUY4a3lDYWJyekZxMFVQZWdlRWJka1lCY0Y5WmJUdmtDNVJHMDYyOFJnV04yaEl2a2IyaFYwV21IWlZZelZwQ0Jaam1wTEdpQmozZDIrNXNxaTV5SlRpeHVsc0ZNdnR0cXQ1dmZDOXJ1bXNwMDFsNlFVdVZsbHZSSnZFd01IMzNxcjdmZ0NObU40V1l2bWdTZ2xzYXJjTjVjd3p6azFaTUtTMFBKKzE4T0dBSmNHek5RYzE0b3g2SUtLbGFnenZSazhuejFpWUI3MzNnVlRDZTU0cXptQSsyaVJZZ3JaQTlzaG51YTYxYVdkdEh0dTM5K0tDTFJxVzUxZnM0TGp2bmtiUHlMeS9lMENiSHBUeXNKeTJKSlpnemVQUDRwem1ocjZscnJZVjdjQWhGUjAwazAxTHhqMnRBeTYwT0crdjcvTCtBcGhUNEkweUdEWU5vcHUzblhiRDhhVkxvclcyTTVlaU0yTjQ1a0lpWEZ1V1hKVHMra0w3V2dGUEVsZDBHM0FaQ0lKcGNEMVIrS3M3b3l6Rkg1VDZsN3R1ekxrMVlET2l5QW9WUldIeWkrL3d0Ty9DUGxZcU01b0xONUd0SFlaNFlmV0hWOXUrdVVmRE5RSEJjS20yYU14M3FDRExZbGxzcy8zazNrOFRuaWNzbjh6dkFoR0wxMms0VitJU01EUHkrSmdBWGlrdmJsVDhKRzNMOGZScmIvcWxVRy8rWVFOdFhUb0NVSnYzSjBLQzdNclROK0lpOTJEZSs0ODNKeFlBWUdtMnZzTk1Gb3Fod2czbEt6aWxHTW1HWUFCVDQ1MTdXditNRUo1Q3JFRG1mM3FNSGJweGpDNk8rOXpCcG9XOUNhNWNNSTEwTjB0c2hPOGpSWUFwUjNzZlU1Mlg4Z0Q1S2t6QmExTDR1dmlSQjZpZTJJSk1QcFQ1M3FJeTZnWG1GWkFTdU1zRDU1eGtkZ2F6TU1DSEhaMENCV1FRUUcyb1lsVXJ1UW03WDdaZ09XblpCbEkyNS9zYWtwR1VLRG83OE95b043TVhPYWlCTHZlY3VpSVJyQVlCekx4NXlNcWpIVG5uZFljSVk5V3pEbS9DU1o4TFhMdDllaEtiWXkxeldBZ2QvYWhrRW5PaDVMc25hSyttd0M4Rm1VY2hYWHhRelU4T2tEUXZYaUF5K0tMa2pkYm52R1o5SjlMUTZWdGxYZ0loWGJXdEdwcG9XNENzNVZMUjBJWmhGZ0Z5Z29qb0xlY1Y5YWVEOHRjRXBVZjFTcXhBSGlWQmREZzIvNzNDTXJ6cXhEUTdaeDVpUWloUUhWeU5JY2VmWHRJVFdUUVBKMHllZFFualE2bGF1TE5UNE9lRTdvL1RNYWhrUDBVdkFmRHBtQTgxTlAyYWZwVXJIS0gvUFlmS1FJcHVCNkQ1S0RIaitrVG5uaDJzTXJHQkF2Rk1vbjhNOE56RHBBaVdiMVBsVFJnUU12UlJEbHlwYTBhK25FY25XbnFRL1MxL1VLK0dHaCtLZzJwS3VibGEyVVg1UmIrQ3ZiTlErWGJPWlpwNVdGNTJxQ0VsNDRpaHUwb2RPdG1qRVQwd2ZnWk1hMDQyRW9jN1VCL3ZYY1dkZ054cksyaVk3M2pkS0xQTzN3a0QrOVhIVHRtOENTanYvVW5FaUZ2U09saUhFRWkxNlNuclgxQnhBbzQybW95MjZpY0oxWGFPblhpOTF3bjY1bnFEczU2YkVFQ25KRWlWNjF6Z3JKdzJXUXQxZncrL2tEV2xNM3NXWGQxSnNSdWZmWFNUQXFBTGZFQ1cvNzRxNkw0Q0x1aDNWeGsxVlRDL1JTUk1ZbCsxV1lxcUpjRmJLeC9WQzBac0tnTkZLZXcvYlFIKzBRcVpLTlV1RWhRdEI2ejIvVlU2OS9HUUNDNU1TS1ZwQmJwSDA4OHRKdWlObHAzbll4YzFUZWl2V0J6VGppUDlXZ21pdHRKaXUrcDVkRlNoWjFCQmVrUS9QRzd1SjdZQ29xYUlWTW52dGNVTnNaQi9iaUpvcm9LbEF3Y2NJR29nVURiYWdLR21iTks0VHRxdEI0MVlHdVQ0ZlVVM2ZLODFNNHRNcXlqU09nQ2ZqbnJ1d2FTc1NtUkFkUXRoR29kU3ltQ0dYclB3cTUyUEMyMlJOWTV1c25yckxCb3c3T28wTTNDSzlYbzlxcVF3RzRXRTRheUF2RkViaFdNdTU0aGRiRnBHM04vU3pRUXU2emlVbEdneEF2Sk1selZ4aUZlMXFGY0pBTVVmMUcrMURQY1gvUHlKWEhnbjRMNHlXaG9IRk9DN0pvbUQ2R2lOaVZaSG1WOUZJSStLQ3kzSXUzNTRzTWFpa0VaenU1T29ncFQ1Zmp0VmV0blBocXVydmNZUUZIMG96OGtzdkFwRUpNVlVaNkFmZTJwQ04xRkNKV1o1bTV4YnhjMml2MmVVZndaUGgyaEdXUGtTeHhTNzlrZEhVcElTVlBFZnBKMkpZSUNGVzkyR05Hc3cxNzAwTWw1TElsdnFTK0hveEp6b0tGSkpTVjZQVi9DR2NVNHJ0WFR5U243UDlHcUx5WDM4YncwYnlNQVV6N3liUjZOQjJRdkZLMytNTjJ1MmxZbzVXcnhTVHo2K2FzSWNSTHdndDQzUzVLZU44NmhSUjU3QlhaT0d0NnhZaHU4TWhaNkt2eE15bnBWeUpuKy8wSXAvSlpYaUZSN3J3ZzBoNWNSWkZKeThsMm1PL3NmNHVxSGdzNzRKTmdVVlRrS3h6S2JWQjVuU1VLUGo3WmFyT3RJdTFORVczM2ZQL3MrTW9IQnRFbm9HRzJVd0k5WDJoVW8xaDZ6LzhPdlBBSDhYWHBtN0hyUXlGcXNuRU5SS3FXc01HMHB5YTlla3ZpTU1NU3RHbFhkQ2FSZ05KTGc9PSIsIm1hYyI6IjI2MTY3Y2UzYmVmOTM3MjQzMmM2YjNjNDA0ZDlkZTIyZTFlN2U0MjFmYmYzMDM0OTNmNDVlYWM2NzE3MDM3NDAiLCJ0YWciOiIifQ==
diff --git a/.github/workflows/build-deploy.yaml b/.github/workflows/build-deploy.yaml
@@ -2,14 +2,14 @@ name: Build and deploy
 
 on:
   push:
-    branches: [production, main]
+    branches: [dev, main]
   pull_request:
     branches: [main]
 
 env:
-  ENVIRONMENT_NAME: "${{ github.event_name == 'push' && github.ref_name == 'production' && 'prod' || 'dev' }}"
+  ENVIRONMENT_NAME: "${{ github.event_name == 'push' && github.ref_name == 'main' && 'prod' || 'dev' }}"
   PACKAGE_NAME: cbp-app-package.tar.gz
-  DEPLOY_PATH: /var/www/vhosts/${{ github.ref_name == 'production' && 'cbp.zhp.pl/cbp.zhp.pl' || 'cbp-dev.zhp.pl/cbp-dev.zhp.pl' }} # until relase; then change to cbp.zhp.pl for sake of clarity
+  DEPLOY_PATH: /var/www/vhosts/${{ github.ref_name == 'main' && 'cbp.zhp.pl/cbp.zhp.pl' || 'cbp-dev.zhp.pl/cbp-dev.zhp.pl' }} # until relase; then change to cbp.zhp.pl for sake of clarity
   PHP_PATH: /opt/plesk/php/8.2/bin/php
 
 jobs:
@@ -150,12 +150,37 @@ jobs:
           name: cbp.bicep
           path: ./infrastructure/cbp.bicep
 
+  deploy-azure:
+    name: Deploy Azure storage
+    if: github.event_name == 'push'
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+      - name: Download bicep artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: cbp.bicep
+
+      - name: Deploy Bicep
+        uses: azure/arm-deploy@v2
+        with:
+          scope: resourcegroup
+          subscriptionId: ${{ vars.AZURE_SUBSCRIPTION_ID }}
+          resourceGroupName: zhp-cbp-${{ env.ENVIRONMENT_NAME }}
+          template: cbp.bicep
+          parameters: environment=${{ env.ENVIRONMENT_NAME }}
+
   deploy-dev:
     name: Deploy to the DEV site
     runs-on: ubuntu-latest
     environment: dev
-    needs: build
-    if: github.event_name == 'push' && github.ref != 'refs/heads/production'
+    needs: [build , deploy-azure]
+    if: github.event_name == 'push' && github.ref != 'refs/heads/main'
     env:
       SSH_COMMAND: 'ssh -o "StrictHostKeyChecking=no" ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER }} -p ${{ secrets.SERVER_PORT }}'
 
@@ -188,7 +213,7 @@ jobs:
         run: ${{ env.SSH_COMMAND }} "cd $DEPLOY_PATH && $PHP_PATH composer.phar install"
 
       - name: Decrypt env
-        run: ${{ env.SSH_COMMAND }} "cd $DEPLOY_PATH && $PHP_PATH artisan env:decrypt --env=$ENVIRONMENT_NAME --key=${{ secrets.DECRYPT_KEY }} --force --filename=.env"
+        run: ${{ env.SSH_COMMAND }} "cd $DEPLOY_PATH && $PHP_PATH artisan env:decrypt --env=${ENVIRONMENT_NAME} --key=${{ secrets.DECRYPT_KEY }} --force --filename=.env"
 
       - name: Run db migrations
         run: ${{ env.SSH_COMMAND }} "cd $DEPLOY_PATH && $PHP_PATH artisan migrate --force --seed"
@@ -208,8 +233,8 @@ jobs:
     name: Deploy to the PROD site
     runs-on: ubuntu-latest
     environment: prod
-    needs: build
-    if: github.event_name == 'push' && github.ref == 'refs/heads/production'
+    needs: [build , deploy-azure]
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     env:
       SSH_COMMAND: 'ssh -o "StrictHostKeyChecking=no" ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER }} -p ${{ secrets.SERVER_PORT }}'
 
@@ -242,7 +267,7 @@ jobs:
         run: ${{ env.SSH_COMMAND }} "cd $DEPLOY_PATH && $PHP_PATH composer.phar install"
 
       - name: Decrypt env
-        run: ${{ env.SSH_COMMAND }} "cd $DEPLOY_PATH && $PHP_PATH artisan env:decrypt --env=$ENVIRONMENT_NAME --key=${{ secrets.DECRYPT_KEY }} --force --filename=.env"
+        run: ${{ env.SSH_COMMAND }} "cd $DEPLOY_PATH && $PHP_PATH artisan env:decrypt --env=${ENVIRONMENT_NAME} --key=${{ secrets.DECRYPT_KEY }} --force --filename=.env"
 
       - name: Run db migrations
         run: ${{ env.SSH_COMMAND }} "cd $DEPLOY_PATH && $PHP_PATH artisan migrate --force --seed"
@@ -257,28 +282,3 @@ jobs:
         run: |
           ${{ env.SSH_COMMAND }} "rm -f /tmp/$PACKAGE_NAME"
           ${{ env.SSH_COMMAND }} "rm -rf /tmp/new_cbp_${ENVIRONMENT_NAME}"
-
-  deploy-azure:
-    name: Deploy Azure storage
-    if: github.event_name == 'push'
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Login to Azure
-        uses: azure/login@v2
-        with:
-          creds: ${{ secrets.AZURE_CREDENTIALS }}
-
-      - name: Download bicep artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: cbp.bicep
-
-      - name: Deploy Bicep
-        uses: azure/arm-deploy@v2
-        with:
-          scope: resourcegroup
-          subscriptionId: ${{ vars.AZURE_SUBSCRIPTION_ID }}
-          resourceGroupName: zhp-cbp-${{ env.ENVIRONMENT_NAME }}
-          template: cbp.bicep
-          parameters: environment=${{ env.ENVIRONMENT_NAME }}