Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(ci): avoid duplicate post-merge e2e runs (#39401)
yyh4b355b703998
diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.ymlindex 18542a1f18d..aec8514a69d 100644--- a/.github/workflows/main-ci.yml+++ b/.github/workflows/main-ci.yml@@ -335,6 +335,8 @@ jobs:- check-changesif: needs.pre_job.outputs.should_skip != 'true' && needs.check-changes.outputs.e2e-changed == 'true'uses: ./.github/workflows/web-e2e.yml+ with:+ run-external-runtime: falsesecrets: inheritweb-e2e-skip:diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.ymlindex 60e15c25e13..c7ee9850b08 100644--- a/.github/workflows/post-merge.yml+++ b/.github/workflows/post-merge.yml@@ -26,19 +26,30 @@ jobs:external_e2e:- 'e2e/features/agent-v2/**'- 'e2e/features/step-definitions/agent-v2/**'+ - 'e2e/features/step-definitions/common/**'- 'e2e/features/support/**'+ - 'e2e/fixtures/auth.ts'- 'e2e/fixtures/test-materials/**'- 'e2e/scripts/**'- 'e2e/support/**'- 'e2e/cucumber.config.ts'- 'e2e/package.json'- 'e2e/test-env.ts'+ - 'e2e/tsconfig.json'- 'e2e/tsx-register.js'+ - 'package.json'+ - 'pnpm-lock.yaml'+ - '.nvmrc'- '.github/workflows/post-merge.yml'- '.github/workflows/web-e2e.yml'- '.github/actions/setup-web/**'+ - 'docker/docker-compose.middleware.yaml'+ - 'docker/envs/middleware.env.example'- 'dify-agent/**'- 'dify-agent-runtime/**'+ - 'api/pyproject.toml'+ - 'api/uv.lock'+ - 'api/tests/integration_tests/.env.example'- 'api/clients/agent_backend/**'- 'api/core/app/apps/agent_app/**'- 'api/core/workflow/nodes/agent_v2/**'@@ -48,8 +59,13 @@ jobs:- 'api/services/plugin/**'- 'api/core/tools/**'- 'api/services/tools/**'+ - 'packages/contracts/package.json'- 'packages/contracts/generated/api/console/agent/**'+ - 'packages/contracts/generated/api/console/apps/**'+ - 'packages/contracts/generated/api/console/datasets/**'- 'packages/contracts/generated/api/console/orpc.gen.ts'+ - 'packages/contracts/generated/api/console/workspaces/**'+ - 'packages/contracts/generated/api/service/**'- 'web/features/agent-v2/**'- 'web/app/(commonLayout)/agents/**'- 'web/app/(commonLayout)/@detailSidebar/agents/**'diff --git a/.github/workflows/web-e2e.yml b/.github/workflows/web-e2e.ymlindex d7cd2657d58..df7ed8d7c92 100644--- a/.github/workflows/web-e2e.yml+++ b/.github/workflows/web-e2e.yml@@ -4,9 +4,9 @@ on:workflow_call:inputs:run-external-runtime:- required: false+ description: Run only the prepared and external runtime suite instead of the core suites.+ required: truetype: boolean- default: falsepermissions:contents: read@@ -46,6 +46,7 @@ jobs:run: uv sync --project api --dev- name: Run E2E support unit tests+ if: ${{ !inputs.run-external-runtime }}working-directory: ./e2erun: vp run test:unit@@ -54,6 +55,7 @@ jobs:run: vp run e2e:install- name: Run isolated source-api and built-web Cucumber E2E tests+ if: ${{ !inputs.run-external-runtime }}working-directory: ./e2eenv:E2E_ADMIN_EMAIL: [email protected]@@ -64,7 +66,7 @@ jobs:run: vp run e2e:full- name: Preserve Chromium E2E report and logs- if: ${{ !cancelled() }}+ if: ${{ !cancelled() && !inputs.run-external-runtime }}run: |if [[ -d e2e/cucumber-report ]]; thenmv e2e/cucumber-report e2e/cucumber-report-non-external@@ -74,6 +76,7 @@ jobs:fi- name: Run WebKit keyboard and browser smoke tests+ if: ${{ !inputs.run-external-runtime }}working-directory: ./e2eenv:E2E_ADMIN_EMAIL: [email protected]@@ -99,7 +102,7 @@ jobs:vp run e2e -- --tags '@browser-smoke'- name: Preserve WebKit E2E report and logs- if: ${{ !cancelled() }}+ if: ${{ !cancelled() && !inputs.run-external-runtime }}run: |if [[ -d e2e/cucumber-report ]]; thenmv e2e/cucumber-report e2e/cucumber-report-webkit