Skip to content

Commit

Permalink
Support gel-server packages in tests-patches
Browse files Browse the repository at this point in the history
  • Loading branch information
msullivan committed Feb 12, 2025
1 parent 939b5bc commit 96395e6
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 25 deletions.
13 changes: 9 additions & 4 deletions .github/scripts/patches/compute-versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,23 @@
versions = []
for obj in data['packages'] + data_testing['packages']:
if (
obj['version_details']['major'] == version
obj['basename'] in {'gel-server', 'edgedb-server'}
and obj['version_details']['major'] == version
and (
not obj['version_details']['prerelease']
or obj['version_details']['prerelease'][0]['phase'] in ('beta', 'rc')
)
):
versions.append((obj['version'], base + obj['installrefs'][0]['ref']))
versions.append((
obj['version'],
obj['basename'],
base + obj['installrefs'][0]['ref'],
))

matrix = {
"include": [
{"edgedb-version": v, "edgedb-url": url, "make-dbs": mk}
for v, url in versions
{"edgedb-version": v, "edgedb-url": url, "edgedb-basename": base, "make-dbs": mk}
for v, base, url in versions
for mk in [True, False]
]
}
Expand Down
5 changes: 2 additions & 3 deletions .github/scripts/patches/create-databases.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# Create databases on the older edgedb version

import edgedb
import os
import subprocess
import sys

version = os.getenv('EDGEDB_VERSION')
cmd = [
f'edgedb-server-{version}/bin/edgedb-server', '-D' 'test-dir',
sys.argv[1], '-D' 'test-dir',
'--testmode', '--security', 'insecure_dev_mode', '--port', '10000',
]
proc = subprocess.Popen(cmd)
Expand Down
13 changes: 4 additions & 9 deletions .github/workflows.src/tests-patches.tpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,14 @@ jobs:
# Run the test

- name: Download an earlier database version and set up a instance
env:
EDGEDB_VERSION: ${{ matrix.edgedb-version }}
EDGEDB_URL: ${{ matrix.edgedb-url }}
run: |
wget -q "$EDGEDB_URL"
tar xzf edgedb-server-$EDGEDB_VERSION.tar.gz
edgedb-server-$EDGEDB_VERSION/bin/edgedb-server -D test-dir --bootstrap-only --testmode
wget -q "${{ matrix.edgedb-url }}"
tar xzf ${{ matrix.edgedb-basename }}-${{ matrix.edgedb-version }}.tar.gz
${{ matrix.edgedb-basename }}-${{ matrix.edgedb-version }}/bin/edgedb-server -D test-dir --bootstrap-only --testmode
- name: Create databases on the older version
env:
EDGEDB_VERSION: ${{ matrix.edgedb-version }}
if: ${{ matrix.make-dbs }}
run: python3 .github/scripts/patches/create-databases.py
run: python3 .github/scripts/patches/create-databases.py ${{ matrix.edgedb-basename }}-${{ matrix.edgedb-version }}/bin/edgedb-server

- name: Run tests with instance created on an older version
run: |
Expand Down
13 changes: 4 additions & 9 deletions .github/workflows/tests-patches.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 96395e6

Please sign in to comment.