Merge pull request #900 from gravitl/develop

update 0.26.0 with workflow changes
gravitl · Nov 13, 2024 · 27c2a64 · 27c2a64
2 parents 0c95a14 + fc25183
commit 27c2a64
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI workflow
 
 on:
   push:
-    branches: [master, main, develop, saas-staging, saas-prod]
+    branches: [master, main, develop, saas-staging, saas-prod, release-**]
   pull_request:
-    branches: [master, main, develop, saas-staging, saas-prod]
+    branches: [master, main, develop, saas-staging, saas-prod, release-**]
 
 jobs:
   lint:

diff --git a/.github/workflows/saas-deploy.yml b/.github/workflows/saas-deploy.yml
@@ -79,15 +79,15 @@ jobs:
       - name: Set Intercom vars
         run: |
           if [ "${{ github.event.inputs.environment }}" == "dev" ]; then
-            kubectl set env deployment ${{ env.VERSION_WITH_DASHES }} PUBLIC_POSTHOG_HOST=${{ secrets.REACT_APP_PUBLIC_POSTHOG_DEV_KEY }} -n accounts
+            kubectl set env deployment ${{ env.VERSION_WITH_DASHES }} PUBLIC_POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_DEV_KEY }} -n accounts
           elif [ "${{ github.event.inputs.environment }}" == "staging" ]; then
-            kubectl set env deployment ${{ env.VERSION_WITH_DASHES }} PUBLIC_POSTHOG_HOST=${{ secrets.REACT_APP_PUBLIC_POSTHOG_DEV_KEY }} -n accounts
+            kubectl set env deployment ${{ env.VERSION_WITH_DASHES }} PUBLIC_POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_DEV_KEY }} -n accounts
           elif [ "${{ github.event.inputs.environment }}" == "prod" ]; then
-            kubectl set env deployment ${{ env.VERSION_WITH_DASHES }} PUBLIC_POSTHOG_HOST=${{ secrets.REACT_APP_PUBLIC_POSTHOG_KEY }} -n accounts
+            kubectl set env deployment ${{ env.VERSION_WITH_DASHES }} PUBLIC_POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_KEY }} -n accounts
           fi
             
           kubectl set env deployment ${{ env.VERSION_WITH_DASHES }} INTERCOM_APP_ID=al371us8 -n accounts
-          kubectl set env deployment ${{ env.VERSION_WITH_DASHES }} PUBLIC_POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_HOST }} -n accounts
+          kubectl set env deployment ${{ env.VERSION_WITH_DASHES }} PUBLIC_POSTHOG_HOST=${{ secrets.REACT_APP_PUBLIC_POSTHOG_HOST }} -n accounts
 
       - name: Deploy to k8s cluster
         run: kubectl rollout restart deploy ${{ env.VERSION_WITH_DASHES }} -n accounts