Skip to content

Commit

Permalink
Merge branch 'main' into devs/linatang/remove_pkg_resources
Browse files Browse the repository at this point in the history
  • Loading branch information
lumoslnt authored Dec 19, 2023
2 parents 32e4834 + 423cd43 commit 79945ca
Show file tree
Hide file tree
Showing 357 changed files with 35,768 additions and 22,120 deletions.
7 changes: 5 additions & 2 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"src/promptflow-tools/tests/**",
"**/flow.dag.yaml",
"**/setup.py",
"scripts/installer/windows/**"
"scripts/installer/windows/**",
"src/promptflow/promptflow/_sdk/_service/pfsvc.py"
],
"words": [
"aoai",
Expand Down Expand Up @@ -152,7 +153,9 @@
"Abhishek",
"restx",
"httpx",
"tiiuae"
"tiiuae",
"nohup",
"metagenai"
],
"flagWords": [
"Prompt Flow"
Expand Down
67 changes: 9 additions & 58 deletions .github/workflows/check_enforcer.yml
Original file line number Diff line number Diff line change
@@ -1,70 +1,21 @@
name: GitHub Event Handler
name: check_enforcer

on:
status

env:
head_sha: ${{ github.sha }}
pull_request:
branches: [ main ]

jobs:
event-handler:
name: ${{ github.event_name }}
check_enforcer:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: git fetch origin main
- run: env | sort >> $GITHUB_OUTPUT
- name: Summarize check status
id: summarize_check_status
working-directory: ${{ github.workspace }}
shell: pwsh
run: |
$env:pending_count = 0
$env:success_count = 0
function check_conclusion {
param(
[string]$conclusion
)
if ($conclusion -ieq "success") {
$env:success_count = 1 + $env:success_count
Write-Host "Success: " $env:success_count
} else {
$env:pending_count = 1 + $env:pending_count
Write-Host "Pending: " $env:pending_count
}
}
$(gh api /repos/${{ github.repository }}/commits/${{ env.head_sha }}/check-runs) | ConvertFrom-Json | Select-Object -ExpandProperty check_runs | ForEach-Object {
if ($_.name.Contains('promptflow-executor-unit-test')) {
check_conclusion $_.conclusion $_.name
}
if ($_.name.Contains('promptflow-executor-e2e-test')) {
check_conclusion $_.conclusion $_.name
}
if ($_.name.Contains('promptflow-sdk-cli-test')) {
check_conclusion $_.conclusion $_.name
}
}
Write-Host "Total not success test numbers: "$pending_count
Write-Host "Total success test numbers: "$success_count
if ($pending_count -eq 0) {
gh api `
--method POST `
-H "Accept: application/vnd.github+json" `
-H "X-GitHub-Api-Version: 2022-11-28" `
/repos/${{ github.repository }}/statuses/${{ env.head_sha }} `
-f state='success' `
-f target_url='https://github.com/microsoft/promptflow/actions/runs/${{ github.run_id }}' `
-f description='The build succeeded!' `
-f context='https://aka.ms/azsdk/checkenforcer'
} else {
gh api `
--method POST `
-H "Accept: application/vnd.github+json" `
-H "X-GitHub-Api-Version: 2022-11-28" `
/repos/${{ github.repository }}/statuses/${{ env.head_sha }} `
-f state='pending' `
-f target_url='https://github.com/microsoft/promptflow/actions/runs/${{ github.run_id }}' `
-f description='Waiting for all checks to succeed' `
-f context='https://aka.ms/azsdk/checkenforcer'
}
. .\scripts\building\check_enforcer.ps1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43 changes: 0 additions & 43 deletions .github/workflows/clean-runtime-disk.yml

This file was deleted.

14 changes: 13 additions & 1 deletion .github/workflows/promptflow-executor-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,19 @@ on:
- cron: "40 20 * * *" # Every day starting at 4:40 BJT
pull_request_target:
paths:
- src/promptflow/**
- src/promptflow/*
- src/promptflow/promptflow/*
- src/promptflow/promptflow/_core/**
- src/promptflow/promptflow/_internal/**
- src/promptflow/promptflow/_utils/**
- src/promptflow/promptflow/batch/**
- src/promptflow/promptflow/contracts/**
- src/promptflow/promptflow/entities/**
- src/promptflow/promptflow/executor/**
- src/promptflow/promptflow/integrations/**
- src/promptflow/promptflow/storage/**
- src/promptflow/tests/*
- src/promptflow/tests/executor/**
- scripts/building/**
- .github/workflows/promptflow-executor-e2e-test.yml
workflow_dispatch:
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/promptflow-executor-unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,19 @@ on:
- cron: "40 19 * * *" # Every day starting at 3:40 BJT
pull_request_target:
paths:
- src/promptflow/**
- src/promptflow/*
- src/promptflow/promptflow/*
- src/promptflow/promptflow/_core/**
- src/promptflow/promptflow/_internal/**
- src/promptflow/promptflow/_utils/**
- src/promptflow/promptflow/batch/**
- src/promptflow/promptflow/contracts/**
- src/promptflow/promptflow/entities/**
- src/promptflow/promptflow/executor/**
- src/promptflow/promptflow/integrations/**
- src/promptflow/promptflow/storage/**
- src/promptflow/tests/*
- src/promptflow/tests/executor/**
- scripts/building/**
- .github/workflows/promptflow-executor-unit-test.yml
workflow_dispatch:
Expand Down
Loading

0 comments on commit 79945ca

Please sign in to comment.