Skip to content

Commit a90c501

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request #298 from microsoft/dev
fix: Merging dev to main branch
2 parents d1718ac + 0bea710 commit a90c501

20 files changed

+11215
-39334
lines changed

‎.github/workflows/azure-dev.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ jobs:
1616
steps:
1717
# Step 1: Checkout the code from your repository
1818
- name: Checkout code
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020

2121
# Step 2: Validate the Azure template using microsoft/template-validation-action
2222
- name: Validate Azure Template
2323
uses: microsoft/[email protected]
2424
id: validation
25+
with:
26+
useDevContainer: false
2527
env:
2628
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
2729
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}

‎.github/workflows/broken-links-checker.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616

1717
steps:
1818
- name: Checkout Repo
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
with:
2121
fetch-depth: 0
2222

2323
# For PR : Get only changed markdown files
2424
- name: Get changed markdown files (PR only)
2525
id: changed-markdown-files
2626
if: github.event_name == 'pull_request'
27-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46
27+
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v46
2828
with:
2929
files: |
3030
**/*.md
@@ -34,7 +34,7 @@ jobs:
3434
- name: Check Broken Links in Changed Markdown Files
3535
id: lychee-check-pr
3636
if: github.event_name == 'pull_request' && steps.changed-markdown-files.outputs.any_changed == 'true'
37-
uses: lycheeverse/lychee-action@v2.4.1
37+
uses: lycheeverse/lychee-action@v2.6.1
3838
with:
3939
args: >
4040
--verbose --exclude-mail --no-progress --exclude ^https?://
@@ -47,7 +47,7 @@ jobs:
4747
- name: Check Broken Links in All Markdown Files in Entire Repo (Manual Trigger)
4848
id: lychee-check-manual
4949
if: github.event_name == 'workflow_dispatch'
50-
uses: lycheeverse/lychee-action@v2.4.1
50+
uses: lycheeverse/lychee-action@v2.6.1
5151
with:
5252
args: >
5353
--verbose --exclude-mail --no-progress --exclude ^https?://

‎.github/workflows/build-docker-image.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222

2323
- name: Set up Docker Buildx
2424
uses: docker/setup-buildx-action@v3
@@ -28,7 +28,7 @@ jobs:
2828
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
2929

3030
- name: Log in to Azure Container Registry
31-
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
31+
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' }}
3232
uses: azure/docker-login@v2
3333
with:
3434
login-server: ${{ env.ACR_LOGIN_SERVER }}
@@ -54,6 +54,9 @@ jobs:
5454
BASE_TAG="demo"
5555
elif [[ "$BRANCH" == "hotfix" ]]; then
5656
BASE_TAG="hotfix"
57+
elif [[ "$BRANCH" == "dependabotchanges" ]]; then
58+
BASE_TAG="dependabotchanges"
59+
5760
else
5861
BASE_TAG="pullrequest-ignore"
5962
fi
@@ -67,7 +70,7 @@ jobs:
6770
with:
6871
context: ./src/ContentProcessor
6972
file: ./src/ContentProcessor/Dockerfile
70-
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
73+
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' }}
7174
tags: |
7275
${{ steps.registry.outputs.ext_registry }}/contentprocessor:${{ env.BASE_TAG }}
7376
${{ steps.registry.outputs.ext_registry }}/contentprocessor:${{ env.DATE_TAG }}
@@ -77,7 +80,7 @@ jobs:
7780
with:
7881
context: ./src/ContentProcessorAPI
7982
file: ./src/ContentProcessorAPI/Dockerfile
80-
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
83+
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' }}
8184
tags: |
8285
${{ steps.registry.outputs.ext_registry }}/contentprocessorapi:${{ env.BASE_TAG }}
8386
${{ steps.registry.outputs.ext_registry }}/contentprocessorapi:${{ env.DATE_TAG }}
@@ -87,7 +90,7 @@ jobs:
8790
with:
8891
context: ./src/ContentProcessorWeb
8992
file: ./src/ContentProcessorWeb/Dockerfile
90-
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
93+
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' }}
9194
tags: |
9295
${{ steps.registry.outputs.ext_registry }}/contentprocessorweb:${{ env.BASE_TAG }}
9396
${{ steps.registry.outputs.ext_registry }}/contentprocessorweb:${{ env.DATE_TAG }}

‎.github/workflows/create-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
with:
1919
ref: ${{ github.event.workflow_run.head_sha }}
2020

21-
- uses: codfish/semantic-release-action@v3
21+
- uses: codfish/semantic-release-action@v4
2222
id: semantic
2323
with:
2424
tag-format: 'v${version}'

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout Code
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828

2929
- name: Setup Azure CLI
3030
run: |

‎.github/workflows/pr-title-checker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
runs-on: ubuntu-latest
1818
if: ${{ github.event_name != 'merge_group' }}
1919
steps:
20-
- uses: amannn/action-semantic-pull-request@v5
20+
- uses: amannn/action-semantic-pull-request@v6
2121
env:
2222
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/pylint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
steps:
1212
# Step 1: Checkout code
1313
- name: Checkout code
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
# Step 2: Set up Python environment
1717
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v5
18+
uses: actions/setup-python@v6
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121

‎.github/workflows/scheduled-Dependabot-PRs-Auto-Merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
runs-on: ubuntu-latest
3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v5
4040

4141
- name: Install GitHub CLI
4242
run: |

‎.github/workflows/stale-bot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
stale:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/stale@v9
15+
- uses: actions/stale@v10
1616
with:
1717
stale-issue-message: 'This issue is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
1818
days-before-stale: 180

‎.github/workflows/telemetry-template-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Check for required metadata template line
2020
run: |

0 commit comments

Comments
 (0)