Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
- name: Log in with Azure
uses: azure/login@v1
with:
client-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).clientId }}
tenant-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).tenantId }}
subscription-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).subscriptionId }}
client-id: ${{ secrets.SECURE_AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.SECURE_AZURE_TENANT_ID }}
subscription-id: ${{ secrets.SECURE_AZURE_SUBSCRIPTION_ID }}

- name: Set Azurite Default Key
run: |
Expand Down Expand Up @@ -72,9 +72,9 @@ jobs:
- name: Log in with Azure
uses: azure/login@v1
with:
client-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).clientId }}
tenant-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).tenantId }}
subscription-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).subscriptionId }}
client-id: ${{ secrets.SECURE_AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.SECURE_AZURE_TENANT_ID }}
subscription-id: ${{ secrets.SECURE_AZURE_SUBSCRIPTION_ID }}

- name: Get image tag
id: get_image_tag
Expand All @@ -94,7 +94,7 @@ jobs:
env:
IMAGE_TAG: ${{needs.build_and_publish.outputs.image_tag}}
ENVIRONMENT: staging
ARM_CLIENT_ID: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).clientId }}
ARM_SUBSCRIPTION_ID: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).subscriptionId }}
ARM_TENANT_ID: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).tenantId }}
ARM_CLIENT_ID: ${{ secrets.SECURE_AZURE_CLIENT_ID }}
ARM_SUBSCRIPTION_ID: ${{ secrets.SECURE_AZURE_SUBSCRIPTION_ID }}
ARM_TENANT_ID: ${{ secrets.SECURE_AZURE_TENANT_ID }}
ARM_USE_OIDC: true
12 changes: 6 additions & 6 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ jobs:
- uses: actions/checkout@v3

- name: Set Azurite Default Key
run: echo "AZURITE_ACCOUNT_KEY=$(curl https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite | grep "Account key:" | cut -b 24-111)" >> $GITHUB_ENV

- name: Verify Azurite Key was retrieved correctly
if: "!startsWith(env.AZURITE_ACCOUNT_KEY, 'Eby8')"
run: echo Failed to find key at learn.microsoft.com && exit 1
run: |
# This is the publicly documented Azurite development key
echo "AZURITE_ACCOUNT_KEY=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBHeksoGMGw==" >> $GITHUB_ENV

- name: Run cibuild
run: ./scripts/cibuild
Expand All @@ -31,7 +29,9 @@ jobs:
cache: "pip"

- name: Set Azurite Default Key
run: echo "AZURITE_ACCOUNT_KEY=$(curl https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite | grep "Account key:" | cut -b 24-111)" >> $GITHUB_ENV
run: |
# This is the publicly documented Azurite development key
echo "AZURITE_ACCOUNT_KEY=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBHeksoGMGw==" >> $GITHUB_ENV

- name: API Validator
run: ./scripts/validate
Loading