Merge branch 'main' of https://github.com/microsoft/promptflow into d…

…evs/peiwen/add_error_handling
microsoft · Dec 7, 2023 · cd511be · cd511be
2 parents 991134b + e381b87
commit cd511be
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/.github/workflows/promptflow-executor-e2e-test.yml b/.github/workflows/promptflow-executor-e2e-test.yml
@@ -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:

diff --git a/.github/workflows/promptflow-executor-unit-test.yml b/.github/workflows/promptflow-executor-unit-test.yml
@@ -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:

diff --git a/src/promptflow/tests/executor/e2etests/test_csharp_executor_proxy.py b/src/promptflow/tests/executor/e2etests/test_csharp_executor_proxy.py
@@ -96,7 +96,7 @@ def create(
         process = multiprocessing.Process(
             target=run_executor_server,
             args=(
-                port,
+                int(port),
                 has_error,
             ),
         )