Skip to content

Commit

Permalink
ci: switch to "dev" as the main nonprod enviroment to be more consist…
Browse files Browse the repository at this point in the history
…ent with JIRA
  • Loading branch information
blacha committed Nov 2, 2023
1 parent 6ebb106 commit 40a25e4
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ jobs:
- name: Benchmark
uses: blacha/hyperfine-action@v1

deploy-nonprod:
deploy-dev:
runs-on: ubuntu-latest
concurrency: deploy-nonprod-${{ github.ref }}
concurrency: deploy-dev-${{ github.ref }}
needs: [build-deploy]
if: github.ref == 'refs/heads/master' && github.repository == 'linz/basemaps'

environment:
name: nonprod
name: dev
url: https://dev.basemaps.linz.govt.nz

permissions:
Expand All @@ -78,30 +78,30 @@ jobs:
# pulls all tags (needed for lerna to correctly version)
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* # see https://stackoverflow.com/a/60184319/9285308

- name: (NonProd) Configure AWS Credentials
- name: (Dev) Configure AWS Credentials
uses: aws-actions/[email protected]
with:
aws-region: ap-southeast-2
mask-aws-account-id: true
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}

- name: (NonProd) Deploy
- name: (Dev) Deploy
run: |
npx lerna run bundle --stream
npx lerna run deploy:deploy --stream
env:
GOOGLE_ANALYTICS: ${{secrets.GOOGLE_ANALYTICS_NON_PROD}}
NODE_ENV: 'dev'

- name: (NonProd) After Deploy Smoke Test
- name: (Dev) After Deploy Smoke Test
run: |
cd packages/smoke
node --test
deploy-prod:
runs-on: ubuntu-latest
concurrency: deploy-prod-${{ github.ref }}
needs: [deploy-nonprod]
needs: [deploy-dev]
if: github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, 'release:')

environment:
Expand Down

0 comments on commit 40a25e4

Please sign in to comment.