Merge branch 'dev' into test/branching-strategy

zesty-io · Mar 20, 2024 · 6c4e927 · 6c4e927
2 parents 21641d3 + 102b690
commit 6c4e927
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 121 deletions.
diff --git a/.github/workflows/cd-beta.yaml b/.github/workflows/cd-beta.yaml
@@ -9,10 +9,10 @@
 #       - beta
 
 # jobs:
-#   deploy_to_beta:
+#   deploy_beta:
 #     runs-on: ubuntu-latest
 #     env:
-#       ENV: "beta"
+#       ENV: "prod"
 
 #     steps:
 #       # This Clean step simply checks if there's already a workflow running from the last
@@ -32,7 +32,7 @@
 #       - name: Set up Gcloud SDK
 #         uses: google-github-actions/setup-gcloud@v0
 #         with:
-#           project_id: zesty-dev
+#           project_id: zesty-prod
 #       - name: Set up Node
 #         uses: actions/setup-node@v2
 #         with:
@@ -42,59 +42,54 @@
 #       - name: Install Dependencies
 #         run: npm install
 #       - name: Build
-#         run: npm run build:dev
+#         run: npm run build:prod
 #         env:
 #           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-#       - name: Deploy to Dev
-#         run: gcloud app deploy app.yaml --quiet --project zesty-dev
-#       - name: Post Successful Dev Deploy Notification To Slack
+#       - name: Deploy to Beta
+#         run: gcloud app deploy app.yaml --quiet --project --version beta zesty-prod
+
+#   failed_deploy_notification_to_slack:
+#     runs-on: ubuntu-latest
+#     if: ${{ failure() }}
+#     needs: deploy_beta
+#     steps:
+#       - name: Failed Deploy Notification To Slack
 #         uses: rtCamp/action-slack-notify@v2
 #         env:
-#           SLACK_CHANNEL: devops
-#           SLACK_COLOR: ${{ job.status }}
+#           SLACK_CHANNEL: code-deploy
+#           SLACK_COLOR: "#FF0000"
 #           SLACK_ICON: https://clipart.world/wp-content/uploads/2021/06/Rocket-Ship-clipart-png.png
-#           SLACK_MESSAGE: |
-#             Use :eyes: to signal you have seen this message.
-#             Use :white_check_mark: to signal you have successfully manually tested the deployed changes.
-#             Use :x: to signal manual tests on deployed changes were unsuccessful and start a thread under this alert describing your remediation steps.
-#           SLACK_TITLE: Successfully Deployed manager-ui to Dev
+#           SLACK_MESSAGE: "PR merge by ${{ github.actor }} failed to deploy."
+#           SLACK_TITLE: FAILED Beta Deployment for manager-ui
 #           SLACK_USERNAME: Deploy Bot
 #           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-#   cancel_workflow_if_beta_deploy_failed:
+
+#   success_deploy_notification_to_slack:
 #     runs-on: ubuntu-latest
-#     if: ${{ failure() }}
-#     needs:
-#       - deploy_to_beta
+#     if: ${{ success() }}
+#     needs: [deploy_beta]
 #     steps:
-#       - name: Post Failed Beta Deploy Notification To Slack
+#       - name: Success Deploy Notification To Slack
 #         uses: rtCamp/action-slack-notify@v2
 #         env:
-#           SLACK_CHANNEL: devops
+#           SLACK_CHANNEL: code-deploy
 #           SLACK_COLOR: "#FF0000"
 #           SLACK_ICON: https://clipart.world/wp-content/uploads/2021/06/Rocket-Ship-clipart-png.png
-#           SLACK_MESSAGE: "PR merge by ${{ github.actor }} has failed to deploy to beta."
-#           SLACK_TITLE: Beta Deployment Failed for manager-ui
+#           SLACK_MESSAGE: "PR merge by ${{ github.actor }} has been deployed to stage."
+#           SLACK_TITLE: Beta Deployment for manager-ui
 #           SLACK_USERNAME: Deploy Bot
 #           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-#       - name: Cancel current workflow run
-#         uses: actions/github-script@v4
-#         with:
-#           script: |
-#             github.actions.cancelWorkflowRun({
-#                 owner: context.repo.owner,
-#                 repo: context.repo.repo,
-#                 run_id: context.runId
-#             })
+
 #   create_stable_pr:
 #     runs-on: ubuntu-latest
 #     needs:
-#       - deploy_to_beta
+#       - deploy_beta
 
 #     steps:
 #       - name: Create Stable Release PR
 #         uses: peter-evans/create-pull-request@v6
 #         with:
-#           branch: beta
-#           base: master
-#           title: master
+#           branch: master
+#           # base: master
+#           title: Stable Release
 #           # labels:
diff --git a/.github/workflows/cd-dev-stage.yaml b/.github/workflows/cd-dev-stage.yaml
@@ -8,7 +8,7 @@ on:
     branches:
       - dev
 jobs:
-  deploy_to_dev:
+  deploy_dev:
     runs-on: ubuntu-latest
     env:
       ENV: "dev"
@@ -46,20 +46,8 @@ jobs:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       - name: Deploy to Dev
         run: gcloud app deploy app.yaml --quiet --project zesty-dev
-      - name: Post Successful Dev Deploy Notification To Slack
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_CHANNEL: devops
-          SLACK_COLOR: ${{ job.status }}
-          SLACK_ICON: https://clipart.world/wp-content/uploads/2021/06/Rocket-Ship-clipart-png.png
-          SLACK_MESSAGE: |
-            Use :eyes: to signal you have seen this message.
-            Use :white_check_mark: to signal you have successfully manually tested the deployed changes.
-            Use :x: to signal manual tests on deployed changes were unsuccessful and start a thread under this alert describing your remediation steps.
-          SLACK_TITLE: Successfully Deployed manager-ui to Dev
-          SLACK_USERNAME: Deploy Bot
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-  deploy_to_stage:
+
+  deploy_stage:
     runs-on: ubuntu-latest
     env:
       ENV: "stage"
@@ -95,26 +83,13 @@ jobs:
         run: npm run build:stage
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-      - name: Deploy to Staging
+      - name: Deploy to Stage
         run: gcloud app deploy app.yaml --quiet --project zesty-stage
-      - name: Post Successful Stage Deploy Notification To Slack
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_CHANNEL: devops
-          SLACK_COLOR: ${{ job.status }}
-          SLACK_ICON: https://clipart.world/wp-content/uploads/2021/06/Rocket-Ship-clipart-png.png
-          SLACK_MESSAGE: |
-            Use :eyes: to signal you have seen this message.
-            Use :white_check_mark: to signal you have successfully manually tested the deployed changes.
-            Use :x: to signal manual tests on deployed changes were unsuccessful and start a thread under this alert describing your remediation steps.
-          SLACK_TITLE: Successfully Deployed manager-ui to Stage
-          SLACK_USERNAME: Deploy Bot
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
   failed_deploy_notification_to_slack:
     runs-on: ubuntu-latest
     if: ${{ failure() }}
-    needs: [deploy_to_dev, deploy_to_stage]
+    needs: [deploy_dev, deploy_stage]
     steps:
       - name: Failed Deploy Notification To Slack
         uses: rtCamp/action-slack-notify@v2
@@ -123,14 +98,14 @@ jobs:
           SLACK_COLOR: "#FF0000"
           SLACK_ICON: https://clipart.world/wp-content/uploads/2021/06/Rocket-Ship-clipart-png.png
           SLACK_MESSAGE: "PR merge by ${{ github.actor }} failed to deploy."
-          SLACK_TITLE: Deployment Failed for manager-ui
+          SLACK_TITLE: FAILED Dev/Stage Deployment for manager-ui
           SLACK_USERNAME: Deploy Bot
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
   success_deploy_notification_to_slack:
     runs-on: ubuntu-latest
     if: ${{ success() }}
-    needs: [deploy_to_stage]
+    needs: [deploy_stage]
     steps:
       - name: Success Deploy Notification To Slack
         uses: rtCamp/action-slack-notify@v2
@@ -145,16 +120,13 @@ jobs:
 
   create_beta_pr:
     runs-on: ubuntu-latest
-    needs:
-      - deploy_to_dev
-      - deploy_to_stage
-
+    needs: [deploy_dev, deploy_stage]
     steps:
       - uses: actions/checkout@v4
       - name: Create Beta Release PR
         uses: peter-evans/create-pull-request@v6
         with:
-          branch: beta
-          # base: dev
-          title: beta
+          branch: dev
+          base: beta
+          title: Beta Release
           # labels:
diff --git a/.github/workflows/cd-stable.yaml b/.github/workflows/cd-stable.yaml
@@ -1,18 +1,15 @@
 # name: cd-stable
 
 # on:
-#   # Uncomment to work on CD in development mode.
-#   # pull_request:
-#   #   branches: [ master ]
 #   push:
 #     branches:
-#       - master
+#       - stable
 
 # jobs:
-#   deploy_to_stable:
+#   deploy_stable:
 #     runs-on: ubuntu-latest
 #     env:
-#       ENV: "stable"
+#       ENV: "prod"
 
 #     steps:
 #       # This Clean step simply checks if there's already a workflow running from the last
@@ -32,7 +29,7 @@
 #       - name: Set up Gcloud SDK
 #         uses: google-github-actions/setup-gcloud@v0
 #         with:
-#           project_id: zesty-dev
+#           project_id: zesty-prod
 #       - name: Set up Node
 #         uses: actions/setup-node@v2
 #         with:
@@ -42,46 +39,40 @@
 #       - name: Install Dependencies
 #         run: npm install
 #       - name: Build
-#         run: npm run build:dev
+#         run: npm run build:prod
 #         env:
 #           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-#       - name: Deploy to Dev
-#         run: gcloud app deploy app.yaml --quiet --project zesty-dev
-#       - name: Post Successful Dev Deploy Notification To Slack
+#       - name: Deploy Stable
+#         run: gcloud app deploy app.yaml --quiet --project zesty-prod
+
+#   failed_deploy_notification_to_slack:
+#     runs-on: ubuntu-latest
+#     if: ${{ failure() }}
+#     needs: deploy_stable
+#     steps:
+#       - name: Failed Deploy Notification To Slack
 #         uses: rtCamp/action-slack-notify@v2
 #         env:
-#           SLACK_CHANNEL: devops
-#           SLACK_COLOR: ${{ job.status }}
+#           SLACK_CHANNEL: code-deploy
+#           SLACK_COLOR: "#FF0000"
 #           SLACK_ICON: https://clipart.world/wp-content/uploads/2021/06/Rocket-Ship-clipart-png.png
-#           SLACK_MESSAGE: |
-#             Use :eyes: to signal you have seen this message.
-#             Use :white_check_mark: to signal you have successfully manually tested the deployed changes.
-#             Use :x: to signal manual tests on deployed changes were unsuccessful and start a thread under this alert describing your remediation steps.
-#           SLACK_TITLE: Successfully Deployed manager-ui to Dev
+#           SLACK_MESSAGE: "PR merge by ${{ github.actor }} failed to deploy."
+#           SLACK_TITLE: FAILED Stable Deployment for manager-ui
 #           SLACK_USERNAME: Deploy Bot
 #           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-#   cancel_workflow_if_beta_deploy_failed:
+
+#   success_deploy_notification_to_slack:
 #     runs-on: ubuntu-latest
-#     if: ${{ failure() }}
-#     needs:
-#       - deploy_to_stable
+#     if: ${{ success() }}
+#     needs: [deploy_stable]
 #     steps:
-#       - name: Post Failed Dev Deploy Notification To Slack
+#       - name: Success Deploy Notification To Slack
 #         uses: rtCamp/action-slack-notify@v2
 #         env:
-#           SLACK_CHANNEL: devops
+#           SLACK_CHANNEL: code-deploy
 #           SLACK_COLOR: "#FF0000"
 #           SLACK_ICON: https://clipart.world/wp-content/uploads/2021/06/Rocket-Ship-clipart-png.png
-#           SLACK_MESSAGE: "PR merge by ${{ github.actor }} has failed to deploy to dev."
-#           SLACK_TITLE: Dev Deployment Failed for manager-ui
+#           SLACK_MESSAGE: "PR merge by ${{ github.actor }} has been deployed to stage."
+#           SLACK_TITLE: Stable Deployment for manager-ui
 #           SLACK_USERNAME: Deploy Bot
 #           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-#       - name: Cancel current workflow run
-#         uses: actions/github-script@v4
-#         with:
-#           script: |
-#             github.actions.cancelWorkflowRun({
-#                 owner: context.repo.owner,
-#                 repo: context.repo.repo,
-#                 run_id: context.runId
-#             })
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,7 +37,6 @@
     "test:open": "./node_modules/.bin/cypress open"
   },
   "dependencies": {
-    "-": "^0.0.1",
     "@aeaton/react-prosemirror": "^0.21.1",
     "@aeaton/react-prosemirror-config-default": "^0.11.0",
     "@babel/runtime": "^7.10.4",