Skip to content

Commit 304e401

Browse files
Merge pull request #382 from microsoft/main
chore: Merge Latest changes from main to demo
2 parents 2986c69 + 2595c2d commit 304e401

File tree

89 files changed

+3148
-1033
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+3148
-1033
lines changed
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Broken Link Checker
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '**/*.md'
7+
workflow_dispatch:
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
markdown-link-check:
14+
name: Check Markdown Broken Links
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout Repo
19+
uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
23+
# For PR : Get only changed markdown files
24+
- name: Get changed markdown files (PR only)
25+
id: changed-markdown-files
26+
if: github.event_name == 'pull_request'
27+
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46
28+
with:
29+
files: |
30+
**/*.md
31+
32+
33+
# For PR: Check broken links only in changed files
34+
- name: Check Broken Links in Changed Markdown Files
35+
id: lychee-check-pr
36+
if: github.event_name == 'pull_request' && steps.changed-markdown-files.outputs.any_changed == 'true'
37+
uses: lycheeverse/[email protected]
38+
with:
39+
args: >
40+
--verbose --exclude-mail --no-progress --exclude ^https?://
41+
${{ steps.changed-markdown-files.outputs.all_changed_files }}
42+
failIfEmpty: false
43+
env:
44+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
45+
46+
# For manual trigger: Check all markdown files in repo
47+
- name: Check Broken Links in All Markdown Files in Entire Repo (Manual Trigger)
48+
id: lychee-check-manual
49+
if: github.event_name == 'workflow_dispatch'
50+
uses: lycheeverse/[email protected]
51+
with:
52+
args: >
53+
--verbose --exclude-mail --no-progress --exclude ^https?://
54+
'**/*.md'
55+
failIfEmpty: false
56+
env:
57+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy-waf.yml

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: Validate WAF Deployment
1+
name: Validate WAF Deployment
22

33
on:
44
push:
55
branches:
66
- main
77
schedule:
8-
- cron: '0 11,23 * * *' # Runs at 11:00 AM and 11:00 PM GMT
8+
- cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT
99

1010
jobs:
1111
deploy:
@@ -21,7 +21,7 @@ jobs:
2121
export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
2222
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
2323
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
24-
export GPT_MIN_CAPACITY="140"
24+
export GPT_MIN_CAPACITY="150"
2525
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
2626
2727
chmod +x infra/scripts/checkquota.sh
@@ -55,7 +55,7 @@ jobs:
5555
- name: Set Deployment Region
5656
run: |
5757
echo "Selected Region: $VALID_REGION"
58-
echo "AZURE_LOCATION=$VALID_REGION" >> $GITHUB_ENV
58+
echo "AZURE_LOCATION=$VALID_REGION" >> $GITHUB_ENV
5959
6060
- name: Setup Azure CLI
6161
run: |
@@ -77,8 +77,7 @@ jobs:
7777
SHORT_UUID=$(uuidgen | cut -d'-' -f1)
7878
UNIQUE_RG_NAME="arg-${ACCL_NAME}-${SHORT_UUID}"
7979
echo "RESOURCE_GROUP_NAME=${UNIQUE_RG_NAME}" >> $GITHUB_ENV
80-
echo "Generated Resource_GROUP_PREFIX: ${UNIQUE_RG_NAME}"
81-
80+
echo "Generated Resource_GROUP_PREFIX: ${UNIQUE_RG_NAME}"
8281
8382
- name: Check and Create Resource Group
8483
id: check_create_rg
@@ -93,6 +92,14 @@ jobs:
9392
echo "Resource group already exists."
9493
fi
9594
95+
- name: Generate Unique Solution Prefix
96+
id: generate_solution_prefix
97+
run: |
98+
COMMON_PART="macae"
99+
TIMESTAMP=$(date +%s)
100+
UPDATED_TIMESTAMP=$(echo $TIMESTAMP | tail -c 6)
101+
UNIQUE_SOLUTION_PREFIX="${COMMON_PART}${UPDATED_TIMESTAMP}"
102+
echo "SOLUTION_PREFIX=${UNIQUE_SOLUTION_PREFIX}" >> $GITHUB_ENV
96103
97104
- name: Deploy Bicep Template
98105
id: deploy
@@ -102,7 +109,10 @@ jobs:
102109
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
103110
--template-file infra/main.bicep \
104111
--parameters \
105-
azureOpenAILocation='${{ env.AZURE_LOCATION }}' \
112+
environmentName=${{ env.SOLUTION_PREFIX }} \
113+
useWafAlignedArchitecture=true \
114+
aiDeploymentsLocation='${{ env.AZURE_LOCATION }}' \
115+
gptModelCapacity=5 \
106116
virtualMachineConfiguration='{"adminUsername": "adminuser", "adminPassword": "P@ssw0rd1234"}' \
107117
logAnalyticsWorkspaceConfiguration='{"existingWorkspaceResourceId": ""}'
108118
@@ -111,29 +121,28 @@ jobs:
111121
if: failure()
112122
run: |
113123
RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
114-
124+
115125
# Construct the email body
116126
EMAIL_BODY=$(cat <<EOF
117127
{
118128
"body": "<p>Dear Team,</p><p>We would like to inform you that the Multi-Agent-Custom-Automation-Engine-Solution-Accelerator Automation process has encountered an issue and has failed to complete successfully.</p><p><strong>Build URL:</strong> ${RUN_URL}<br> ${OUTPUT}</p><p>Please investigate the matter at your earliest convenience.</p><p>Best regards,<br>Your Automation Team</p>"
119129
}
120130
EOF
121131
)
122-
132+
123133
# Send the notification
124134
curl -X POST "${{ secrets.LOGIC_APP_URL }}" \
125135
-H "Content-Type: application/json" \
126136
-d "$EMAIL_BODY" || echo "Failed to send notification"
127-
128-
137+
129138
- name: Get OpenAI Resource from Resource Group
130139
id: get_openai_resource
131140
run: |
132141
133142
134143
set -e
135144
echo "Fetching OpenAI resource from resource group ${{ env.RESOURCE_GROUP_NAME }}..."
136-
145+
137146
# Run the az resource list command to get the OpenAI resource name
138147
openai_resource_name=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --resource-type "Microsoft.CognitiveServices/accounts" --query "[0].name" -o tsv)
139148
@@ -145,9 +154,6 @@ jobs:
145154
echo "OpenAI resource name: ${openai_resource_name}"
146155
fi
147156
148-
149-
150-
151157
- name: Delete Bicep Deployment
152158
if: always()
153159
run: |
@@ -165,11 +171,10 @@ jobs:
165171
echo "Resource group does not exists."
166172
fi
167173
168-
169174
- name: Wait for resource deletion to complete
170175
run: |
171176
172-
177+
173178
# Add resources to the array
174179
resources_to_check=("${{ env.OPENAI_RESOURCE_NAME }}")
175180
@@ -217,7 +222,6 @@ jobs:
217222
fi
218223
done
219224
220-
221225
- name: Purging the Resources
222226
if: always()
223227
run: |

0 commit comments

Comments
 (0)