From f999f6cdc9f09c845ee32f5f0cf7f79a04088edd Mon Sep 17 00:00:00 2001 From: the_aceix Date: Wed, 13 Nov 2024 10:23:47 +0000 Subject: [PATCH] fix: patch ci workflows update CI and deployment workflows to include release branches and correct PostHog environment variable names --- .github/workflows/ci.yml | 4 ++-- .github/workflows/saas-deploy.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7861713e..d5acc8e5 100644 --- 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 index 5b453b33..b591166d 100644 --- 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