From f063dc0191d5cb36a4fc59124a74366f5f4b61cb Mon Sep 17 00:00:00 2001 From: heyitsaamir Date: Tue, 17 Sep 2024 16:55:21 -0700 Subject: [PATCH] Update --- .github/actions/build/action.yml | 11 +++++++---- .github/workflows/build_deploy_workflow_msft.yml | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 54c4d1c..6bd62a4 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -7,6 +7,9 @@ inputs: REGISTRY_USERNAME: description: 'Registry username' required: false + REGISTRY_NAME: + description: 'Registry name' + required: false REGISTRY_PASSWORD: description: 'Registry password' required: false @@ -45,14 +48,14 @@ runs: uses: azure/login@v1 if: env.CREDS_PROVIDED == 'false' with: - client-id: ${{ secrets.AZURE_CLIENT_ID_GITHUB_AUTH }} - tenant-id: ${{ secrets.AZURE_TENANT_ID }} - subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + client-id: ${{ inputs.AZURE_CLIENT_ID_GITHUB_AUTH }} + tenant-id: ${{ inputs.AZURE_TENANT_ID }} + subscription-id: ${{ inputs.AZURE_SUBSCRIPTION_ID }} - name: 'Login to ACR via OIDC' shell: bash if: env.CREDS_PROVIDED == 'false' - run: az acr login --name + run: az acr login --name {{ $inputs.REGISTRY_NAME }} - name: Login to Registry Password uses: azure/docker-login@v1 diff --git a/.github/workflows/build_deploy_workflow_msft.yml b/.github/workflows/build_deploy_workflow_msft.yml index 8f8f0ff..f1f97a1 100644 --- a/.github/workflows/build_deploy_workflow_msft.yml +++ b/.github/workflows/build_deploy_workflow_msft.yml @@ -29,6 +29,7 @@ jobs: AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + REGISTRY_NAME: athenaprivacyreviewbeta - name: Deploy to prod uses: ./.github/actions/deploy with: