Skip to content

Commit 30cef2f

Browse files
Merge pull request #255 from microsoft/dependabotchanges
build: Merge Dependabot Changes into Dev Branch
2 parents 6b4d7bd + 1625633 commit 30cef2f

5 files changed

Lines changed: 3498 additions & 4246 deletions

File tree

.github/workflows/docker-build-and-push.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
username: ${{ secrets.ACR_USERNAME }}
3333
password: ${{ secrets.ACR_PASSWORD }}
3434

35-
- name: Log in to Azure Container Registry (Dev/Demo)
36-
if: ${{ github.ref_name == 'dev' || github.ref_name == 'demo' }}
35+
- name: Log in to Azure Container Registry (Dev/Demo/Dependabotchanges)
36+
if: ${{ github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }}
3737
uses: azure/docker-login@v2
3838
with:
3939
login-server: ${{ secrets.ACR_DEV_LOGIN_SERVER }}
@@ -57,6 +57,8 @@ jobs:
5757
echo "tagname=dev" >> $GITHUB_OUTPUT
5858
elif [[ "${{ github.ref_name }}" == "demo" ]]; then
5959
echo "tagname=demo" >> $GITHUB_OUTPUT
60+
elif [[ "${{ github.ref_name }}" == "dependabotchanges" ]]; then
61+
echo "tagname=dependabotchanges" >> $GITHUB_OUTPUT
6062
else
6163
echo "tagname=default" >> $GITHUB_OUTPUT
6264
@@ -67,7 +69,7 @@ jobs:
6769
with:
6870
context: .
6971
file: WebApp.Dockerfile
70-
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
72+
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }}
7173
tags: |
7274
${{ steps.registry.outputs.registry }}/webapp:${{ steps.determine_tag.outputs.tagname }}
7375
${{ steps.registry.outputs.registry }}/webapp:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}

0 commit comments

Comments
 (0)