Sync with #7536

geldata · Jul 8, 2024 · 6404a94 · 6404a94
1 parent 688e1ac
commit 6404a94
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git 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
@@ -11,21 +11,28 @@ 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
     paths:
       - '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