Improve pool and Rust CI

.github/Makefile

@@ -8,9 +8,10 @@ all: workflows/nightly.yml \
 	workflows/dryrun.yml \
 	workflows/ls-nightly.yml \
 	workflows/tests.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
@@ -19,6 +20,9 @@ workflows/%.yml: workflows.src/%.tpl.yml workflows.src/%.targets.yml workflows.s
 workflows.src/tests.tpl.yml: workflows.src/tests.inc.yml
 	touch $(ROOT)/workflows.src/tests.tpl.yml
 
+workflows.src/tests-pool.tpl.yml: workflows.src/tests.inc.yml
+	touch $(ROOT)/workflows.src/tests-pool.tpl.yml
+
 workflows.src/tests-managed-pg.tpl.yml: workflows.src/tests.inc.yml
 	touch $(ROOT)/workflows.src/tests-managed-pg.tpl.yml
 

.github/workflows.src/tests-pool.targets.yml

@@ -0,0 +1 @@
+data:

.github/workflows/test-pool.yml → .github/workflows.src/tests-pool.tpl.yml

@@ -1,3 +1,5 @@
+<% from "tests.inc.yml" import build, calc_cache_key -%>
+
 name: Pool Simulation Test
 
 on:
@@ -7,52 +9,35 @@ on:
       - pool-test
     paths:
       - '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
-      with:
-        fetch-depth: 0
-        submodules: false
-
     - 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 }}
 
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.12.2'
-
-    - name: Generate requirements.txt
-      run: |
-        echo 'uvloop==0.19.0' > requirements.txt
-        mkdir -p pool-simulation/reports
-
-    - name: Handle virtualenv
-      uses: syphar/[email protected]
-      id: venv-cache
-
-    - name: Install Python dependencies
-      if: steps.venv-cache.outputs.cache-hit != 'true'
+    <%- call build() -%>
+    - name: Compute cache keys
       run: |
-        pip install -r requirements.txt
+        << calc_cache_key()|indent >>
+    <%- endcall %>
 
     - name: Run the pool simulation test
       env:
@@ -69,4 +54,4 @@ jobs:
         branch: main
         cwd: pool-simulation
         author_name: github-actions
-        author_email: 41898282+github-actions[bot]@users.noreply.github.com
+        author_email: 41898282+github-actions[bot]@users.noreply.github.com

.github/workflows.src/tests.inc.yml

@@ -80,9 +80,9 @@
       id: rust-cache
       with:
         path: build/rust_extensions
-        key: edb-rust-v3-${{ hashFiles('.tmp/rust_cache_key.txt') }}
+        key: edb-rust-v4-${{ hashFiles('.tmp/rust_cache_key.txt') }}
         restore-keys: |
-          edb-rust-v3-
+          edb-rust-v4-
 
     - name: Handle cached Cython extensions
       uses: actions/cache@v4
@@ -368,7 +368,7 @@
       id: rust-cache
       with:
         path: build/rust_extensions
-        key: edb-rust-v3-${{ hashFiles('.tmp/rust_cache_key.txt') }}
+        key: edb-rust-v4-${{ hashFiles('.tmp/rust_cache_key.txt') }}
 
     - name: Restore cached Cython extensions
       uses: actions/cache@v4