Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
14 changes: 13 additions & 1 deletion .github/workflows/ci-sample-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,21 @@ jobs:
exceptions=("incoming-webhook-notification" "hello-world-office-addin")
samples=`jq -r ".samples | .[] | select(has(\"downloadUrlInfo\") | not) | .id" .config/samples-config-v3.json`
validationFailed="validation failed"
validationWarning="warning"
validationResult=true
while IFS= read -r line; do
if [[ ! ${exceptions[@]} =~ $line ]]
then
result=`node ./validation-tool/validator.cjs -p $line`
if grep -q "$validationFailed" <<< "$result"; then
printf "\nSample '$line' validation failed.\n"
printf "\n❌ Sample '$line' validation failed.\n"
echo "$result"
validationResult=false
elif grep -q "$validationWarning" <<< "$result"; then
printf "\n⚠️ Sample '$line' validation passed with warnings.\n"
echo "$result"
else
printf "\n✅ Sample '$line' validation passed.\n"
fi
fi
done <<< "$samples"
Expand All @@ -80,13 +86,19 @@ jobs:
run: |
# This script runs the validation tool against changed samples in the pull request.
# External samples are excluded from the validation.
# Deleted folders are skipped (they no longer exist).
exceptions=(".config" ".devcontainer" "assets" "templates" "validation-tool" "basic-blazor-tab-app" "incoming-webhook-notification" "stocks-update-notification-bot-dotnet" "whos-next-meeting-app")
samples=`jq -r ".[]" <<< '${{ steps.get_changed_folders.outputs.changed }}'`
validationFailed="validation failed"
validationResult=true
while IFS= read -r line; do
if [[ ! ${exceptions[@]} =~ $line ]]
then
# Skip deleted folders - they no longer exist so cannot be validated
if [ ! -d "$line" ]; then
printf "\nSkipping deleted folder: '$line'\n"
continue
fi
result=`node ./validation-tool/validator.cjs -p $line`
if grep -q "$validationFailed" <<< "$result"; then
printf "\nSample '$line' validation failed.\n"
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,18 @@ jobs:
strategy:
fail-fast: false
matrix:
language: ["csharp", "javascript"]
include:
# C# uses 'none' build mode to skip building .atkproj files (Teams Toolkit projects)
# which require the Teams Toolkit extension that isn't available in CI environments.
# The 'none' mode creates a CodeQL database directly from source without requiring a build.
- language: csharp
build-mode: none
# JavaScript/TypeScript only supports 'none' build mode (interpreted language)
- language: javascript
build-mode: none
# Python only supports 'none' build mode (interpreted language)
- language: python
build-mode: none
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

Expand All @@ -45,27 +56,16 @@ jobs:
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
config-file: .github/codeql/codeql-config.yml
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release
# No autobuild needed when using 'none' build mode
# The 'none' mode analyzes source code directly without compilation,
# which avoids issues with .atkproj files that require Teams Toolkit SDK

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
4 changes: 3 additions & 1 deletion ProxyAgent-CSharp/M365Agent/m365agents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

version: v1.8

additionalMetadata:
sampleTag: TeamsFx-Samples:ProxyAgent-CSharp

environmentFolderPath: ./env

# Triggered when 'atk provision' is executed
Expand Down Expand Up @@ -96,4 +99,3 @@ deploy:
# or add it to your environment variable file.
resourceId: ${{WEBAPPID}}
workingDirectory: ../AzureAgentToM365ATK
projectId: a5ce45d0-c7f9-4964-828d-957cfa33b952
Binary file modified ProxyAgent-CSharp/images/screen009.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified coffee-agent/assets/coffee-agent-sample-response.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 0 additions & 14 deletions collaborator-agent/.gitignore

This file was deleted.

95 changes: 0 additions & 95 deletions collaborator-agent/.vscode/launch.json

This file was deleted.

Loading
Loading