Merge branch 'dev' into test/branching-strategy

zesty-io · Mar 20, 2024 · 1f055fe · 1f055fe
2 parents 92e7676 + 2a2ec47
commit 1f055fe
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 105 deletions.
diff --git a/.github/workflows/cd-beta.yaml b/.github/workflows/cd-beta.yaml
@@ -1,95 +1,89 @@
-# name: cd-beta
+name: cd-beta
 
-# on:
-#   # Uncomment to work on CD in development mode.
-#   # pull_request:
-#   #   branches: [ master ]
-#   push:
-#     branches:
-#       - beta
+on:
+  push:
+    branches:
+      - beta
 
-# jobs:
-#   deploy_beta:
-#     runs-on: ubuntu-latest
-#     env:
-#       ENV: "prod"
+jobs:
+  #   deploy_beta:
+  #     runs-on: ubuntu-latest
+  #     env:
+  #       ENV: "prod"
 
-#     steps:
-#       # This Clean step simply checks if there's already a workflow running from the last
-#       # commit and cancels it if there is. This helps us save on cloud cost in the long run.
-#       # See https://github.com/rokroskar/workflow-run-cleanup-action for more information.
-#       - name: Clean
-#         uses: rokroskar/workflow-run-cleanup-action@v0.2.2
-#         env:
-#           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-#         if: "github.ref != 'refs/heads/master'"
-#       - name: Checkout Repo
-#         uses: actions/checkout@v2
-#       - name: Auth with Gcloud
-#         uses: google-github-actions/auth@v0
-#         with:
-#           credentials_json: ${{ secrets.GCP_DEV_SA_KEY }}
-#       - name: Set up Gcloud SDK
-#         uses: google-github-actions/setup-gcloud@v0
-#         with:
-#           project_id: zesty-prod
-#       - name: Set up Node
-#         uses: actions/setup-node@v2
-#         with:
-#           node-version: "16.5.0"
-#           cache: "npm"
-#           cache-dependency-path: package-lock.json
-#       - name: Install Dependencies
-#         run: npm install
-#       - name: Build
-#         run: npm run build:prod
-#         env:
-#           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-#       - name: Deploy to Beta
-#         run: gcloud app deploy app.yaml --quiet --project --version beta zesty-prod
+  #     steps:
+  #       # This Clean step simply checks if there's already a workflow running from the last
+  #       # commit and cancels it if there is. This helps us save on cloud cost in the long run.
+  #       # See https://github.com/rokroskar/workflow-run-cleanup-action for more information.
+  #       - name: Clean
+  #         uses: rokroskar/workflow-run-cleanup-action@v0.2.2
+  #         env:
+  #           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+  #         if: "github.ref != 'refs/heads/master'"
+  #       - name: Checkout Repo
+  #         uses: actions/checkout@v2
+  #       - name: Auth with Gcloud
+  #         uses: google-github-actions/auth@v0
+  #         with:
+  #           credentials_json: ${{ secrets.GCP_DEV_SA_KEY }}
+  #       - name: Set up Gcloud SDK
+  #         uses: google-github-actions/setup-gcloud@v0
+  #         with:
+  #           project_id: zesty-prod
+  #       - name: Set up Node
+  #         uses: actions/setup-node@v2
+  #         with:
+  #           node-version: "16.5.0"
+  #           cache: "npm"
+  #           cache-dependency-path: package-lock.json
+  #       - name: Install Dependencies
+  #         run: npm install
+  #       - name: Build
+  #         run: npm run build:prod
+  #         env:
+  #           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+  #       - name: Deploy to Beta
+  #         run: gcloud app deploy app.yaml --quiet --no-promote --version beta --project 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: 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 }} failed to deploy."
-#           SLACK_TITLE: FAILED Beta Deployment for manager-ui
-#           SLACK_USERNAME: Deploy Bot
-#           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+  #   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: 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 }} failed to deploy."
+  #           SLACK_TITLE: FAILED Beta 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_beta]
-#     steps:
-#       - name: Success Deploy Notification To Slack
-#         uses: rtCamp/action-slack-notify@v2
-#         env:
-#           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 been deployed to stage."
-#           SLACK_TITLE: Beta 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_beta]
+  #     steps:
+  #       - name: Success Deploy Notification To Slack
+  #         uses: rtCamp/action-slack-notify@v2
+  #         env:
+  #           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 been deployed to stage."
+  #           SLACK_TITLE: Beta Deployment for manager-ui
+  #           SLACK_USERNAME: Deploy Bot
+  #           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
-#   create_stable_pr:
-#     runs-on: ubuntu-latest
-#     needs:
-#       - deploy_beta
-
-#     steps:
-#       - name: Create Stable Release PR
-#         uses: peter-evans/create-pull-request@v6
-#         with:
-#           branch: master
-#           # base: master
-#           title: Stable Release
-#           # labels:
+  create_stable_pr:
+    runs-on: ubuntu-latest
+    # needs: [deploy_beta]
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+      - name: Create Stable Release PR
+        run: gh pr create -B stable -H beta --title 'Stable Release' --body 'Created by Github action'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/cd-dev-stage.yaml b/.github/workflows/cd-dev-stage.yaml
@@ -25,11 +25,11 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Auth with Gcloud
-        uses: google-github-actions/auth@v0
+        uses: google-github-actions/auth@v2
         with:
           credentials_json: ${{ secrets.GCP_DEV_SA_KEY }}
       - name: Set up Gcloud SDK
-        uses: google-github-actions/setup-gcloud@v0
+        uses: google-github-actions/setup-gcloud@v2
         with:
           project_id: zesty-dev
       - name: Set up Node
@@ -111,7 +111,7 @@ jobs:
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: code-deploy
-          SLACK_COLOR: "#FF0000"
+          SLACK_COLOR: "#36a64f"
           SLACK_ICON: https://clipart.world/wp-content/uploads/2021/06/Rocket-Ship-clipart-png.png
           SLACK_MESSAGE: "PR merge by ${{ github.actor }} has been deployed to stage."
           SLACK_TITLE: Stage Deployment for manager-ui
@@ -122,11 +122,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [deploy_dev, deploy_stage]
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Repo
+        uses: actions/checkout@v2
       - name: Create Beta Release PR
-        uses: peter-evans/create-pull-request@v6
-        with:
-          branch: dev
-          base: beta
-          title: Beta Release
-          # labels:
+        run: gh pr create -B beta -H dev --title 'Beta Release' --body 'Created by Github action'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/cd-stable.yaml b/.github/workflows/cd-stable.yaml
@@ -1,11 +1,11 @@
-# name: cd-stable
+name: cd-stable
 
-# on:
-#   push:
-#     branches:
-#       - stable
+on:
+  push:
+    branches:
+      - stable
 
-# jobs:
+jobs:
 #   deploy_stable:
 #     runs-on: ubuntu-latest
 #     env: