diff --git a/.github/Makefile b/.github/Makefile index 83f48c74d483..990613304dc1 100644 --- a/.github/Makefile +++ b/.github/Makefile @@ -8,10 +8,10 @@ all: workflows/nightly.yml \ workflows/dryrun.yml \ workflows/ls-nightly.yml \ workflows/tests.yml \ - workflows/tests-pool.yml \ - workflows/tests-managed-pg.yml \ + workflows/tests-pool.yml \ + workflows/tests-managed-pg.yml \ workflows/tests-ha.yml \ - workflows/tests-pg-versions.yml \ + workflows/tests-pg-versions.yml \ workflows/tests-patches.yml workflows/%.yml: workflows.src/%.tpl.yml workflows.src/%.targets.yml workflows.src/build.inc.yml workflows.src/ls-build.inc.yml diff --git a/.github/workflows.src/tests-pool.tpl.yml b/.github/workflows.src/tests-pool.tpl.yml index 53da351beaf7..8ec4a2db4d4f 100644 --- a/.github/workflows.src/tests-pool.tpl.yml +++ b/.github/workflows.src/tests-pool.tpl.yml @@ -11,7 +11,7 @@ on: - 'edb/server/connpool/**' - 'edb/server/conn_pool/**' - 'tests/test_server_pool.py' - - '.github/workflows/test-pool.yml' + - '.github/workflows/tests-pool.yml' pull_request: branches: - master @@ -19,13 +19,20 @@ on: - 'edb/server/connpool/**' - 'edb/server/conn_pool/**' - 'tests/test_server_pool.py' - - '.github/workflows/test-pool.yml' + - '.github/workflows/tests-pool.yml' jobs: test: runs-on: ubuntu-latest concurrency: pool-test steps: + - uses: actions/checkout@v4 + if: startsWith(github.ref, 'refs/heads') + with: + repository: edgedb/edgedb-pool-simulation + path: pool-simulation + token: ${{ secrets.GITHUB_CI_BOT_TOKEN }} + <%- call build() -%> - name: Compute cache keys run: | diff --git a/.github/workflows/tests-pool.yml b/.github/workflows/tests-pool.yml index 4bd6aa3c1639..60ba09ef6f4e 100644 --- a/.github/workflows/tests-pool.yml +++ b/.github/workflows/tests-pool.yml @@ -9,7 +9,7 @@ on: - 'edb/server/connpool/**' - 'edb/server/conn_pool/**' - 'tests/test_server_pool.py' - - '.github/workflows/test-pool.yml' + - '.github/workflows/tests-pool.yml' pull_request: branches: - master @@ -17,13 +17,19 @@ on: - 'edb/server/connpool/**' - 'edb/server/conn_pool/**' - 'tests/test_server_pool.py' - - '.github/workflows/test-pool.yml' + - '.github/workflows/tests-pool.yml' jobs: test: runs-on: ubuntu-latest concurrency: pool-test steps: + - uses: actions/checkout@v4 + if: startsWith(github.ref, 'refs/heads') + with: + repository: edgedb/edgedb-pool-simulation + path: pool-simulation + token: ${{ secrets.GITHUB_CI_BOT_TOKEN }} - uses: actions/checkout@v4 with: fetch-depth: 0