From 51385346bcfec6d8502d8f1acc056c19e4e59199 Mon Sep 17 00:00:00 2001 From: Adam Kendis Date: Wed, 1 Jul 2020 13:11:20 -0700 Subject: [PATCH 1/2] Update dev deploy workflow --- .../workflows/Continuous_Deployment_Frontend_Dev.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Continuous_Deployment_Frontend_Dev.yml b/.github/workflows/Continuous_Deployment_Frontend_Dev.yml index 498eab507..3dc36d759 100644 --- a/.github/workflows/Continuous_Deployment_Frontend_Dev.yml +++ b/.github/workflows/Continuous_Deployment_Frontend_Dev.yml @@ -2,10 +2,12 @@ name: Deploy_Frontend_Dev on: push: + # branches: + # - dev + # paths: + # - 'src/**' branches: - - dev - paths: - - 'src/**' + - FRONT-envCleanup jobs: build: @@ -20,8 +22,8 @@ jobs: - name: Setup environment run: | echo MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > src/.env - echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} > src/.env - echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} > src/.env + echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} >> src/.env + echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} >> src/.env echo API_URL=${{ secrets.API_URL_DEV }} >> src/.env echo MIXPANEL_ENABLED=${{ secrets.MIXPANEL_ENABLED }} >> src/.env echo MIXPANEL_TOKEN_PROD=${{ secrets.MIXPANEL_TOKEN_PROD }} >> src/.env From 3d2c44c6651b5a9b3f4cdcd339745881868add88 Mon Sep 17 00:00:00 2001 From: Adam Kendis Date: Wed, 1 Jul 2020 18:10:21 -0700 Subject: [PATCH 2/2] Fixed frontend workflows. --- .github/workflows/Continuous_Deployment_Frontend_Dev.yml | 8 +++----- .github/workflows/Continuous_Deployment_Frontend_Prod.yml | 4 ++-- .github/workflows/Continuous_Integration_Frontend.yml | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/Continuous_Deployment_Frontend_Dev.yml b/.github/workflows/Continuous_Deployment_Frontend_Dev.yml index 3dc36d759..cfa346813 100644 --- a/.github/workflows/Continuous_Deployment_Frontend_Dev.yml +++ b/.github/workflows/Continuous_Deployment_Frontend_Dev.yml @@ -2,12 +2,10 @@ name: Deploy_Frontend_Dev on: push: - # branches: - # - dev - # paths: - # - 'src/**' branches: - - FRONT-envCleanup + - dev + paths: + - 'src/**' jobs: build: diff --git a/.github/workflows/Continuous_Deployment_Frontend_Prod.yml b/.github/workflows/Continuous_Deployment_Frontend_Prod.yml index eef8bb52b..09539d677 100644 --- a/.github/workflows/Continuous_Deployment_Frontend_Prod.yml +++ b/.github/workflows/Continuous_Deployment_Frontend_Prod.yml @@ -20,8 +20,8 @@ jobs: - name: Setup environment run: | echo MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > src/.env - echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} > src/.env - echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} > src/.env + echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} >> src/.env + echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} >> src/.env echo API_URL=${{ secrets.API_URL_PROD }} >> src/.env echo MIXPANEL_ENABLED=${{ secrets.MIXPANEL_ENABLED }} >> src/.env echo MIXPANEL_TOKEN_PROD=${{ secrets.MIXPANEL_TOKEN_PROD }} >> src/.env diff --git a/.github/workflows/Continuous_Integration_Frontend.yml b/.github/workflows/Continuous_Integration_Frontend.yml index fdc1a60ed..3b91fe009 100644 --- a/.github/workflows/Continuous_Integration_Frontend.yml +++ b/.github/workflows/Continuous_Integration_Frontend.yml @@ -17,8 +17,8 @@ jobs: - name: Setup environment run: | echo MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > src/.env - echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} > src/.env - echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} > src/.env + echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} >> src/.env + echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} >> src/.env echo API_URL=${{ secrets.API_URL_PROD }} >> src/.env echo MIXPANEL_ENABLED=${{ secrets.MIXPANEL_ENABLED }} >> src/.env echo MIXPANEL_TOKEN_PROD=${{ secrets.MIXPANEL_TOKEN_PROD }} >> src/.env