Skip to content

Commit

Permalink
Merge pull request #74 from IATI/develop
Browse files Browse the repository at this point in the history
Develop to main for renaming function
  • Loading branch information
akmiller01 authored Aug 25, 2021
2 parents ed8c3a5 + b78e0b5 commit 9d0d0d8
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 43 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/develop-func-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- develop

env:
STAGE: dev # prefix to indicate environment stage
STAGE: dev # postfix to indicate environment stage
NAME: func-validator-services
AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
NODE_VERSION: '14.x' # set this to the node version to use (supports 8.x, 10.x, 12.x)
Expand Down Expand Up @@ -57,13 +57,13 @@ jobs:
- name: 'Run Azure Functions Action'
uses: Azure/functions-action@v1
with:
app-name: ${{ env.STAGE }}-${{ env.NAME }}
app-name: ${{ env.NAME }}-${{ env.STAGE }}
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}

- name: Set Env variables for connecting to Postgres and Redis instances
uses: Azure/appservice-settings@v1
with:
app-name: '${{env.STAGE}}-${{env.NAME}}'
app-name: '${{env.NAME}}-${{env.STAGE}}'
app-settings-json: |
[
{
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prod-func-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: 'Login via Azure CLI'
uses: azure/login@v1
with:
creds: ${{ secrets.DEV_AZURE_CREDENTIALS }} # Service Principal credentials saved in GitHub Secrets
creds: ${{ secrets.PROD_AZURE_CREDENTIALS }} # Service Principal credentials saved in GitHub Secrets

- name: 'Resolve Project Dependencies Using Npm'
shell: bash
Expand All @@ -48,13 +48,13 @@ jobs:
- name: 'Run Azure Functions Action'
uses: Azure/functions-action@v1
with:
app-name: ${{ env.STAGE }}-${{ env.NAME }}
app-name: ${{ env.NAME }}-${{ env.STAGE }}
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}

- name: Set Env variables for connecting to Postgres and Redis instances
uses: Azure/appservice-settings@v1
with:
app-name: '${{env.STAGE}}-${{env.NAME}}'
app-name: '${{ env.NAME }}-${{ env.STAGE }}'
app-settings-json: |
[
{
Expand Down
81 changes: 46 additions & 35 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"eslint": "^7.32.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.24.1",
"husky": "^7.0.1",
"eslint-plugin-import": "^2.24.2",
"husky": "^7.0.2",
"lint-staged": "^11.1.2",
"prettier": "^2.3.2"
},
Expand Down

0 comments on commit 9d0d0d8

Please sign in to comment.