Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use correct pkg runner to run pkgs #1181

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
187 changes: 91 additions & 96 deletions .github/workflows/release.yml

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@ jobs:
matrix:
node-version: ["18", "20", "22"]
os: [ubuntu-latest]
edgedb-version: ["stable"]
gel-version: ["stable"]
include:
- os: ubuntu-latest
node-version: "20"
edgedb-version: "nightly"
gel-version: "nightly"
- os: ubuntu-latest
node-version: "20"
edgedb-version: "5"
gel-version: "5"
- os: ubuntu-latest
node-version: "20"
edgedb-version: "4"
gel-version: "4"
# - os: ubuntu-latest
# node-version: "20"
# edgedb-version: "3"
# gel-version: "3"
# XXX: macOS is currently unsupported by setup-edgedb
# - os: macos-latest
# node-version: "20"
# edgedb-version: "stable"
# gel-version: "stable"

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -77,35 +77,35 @@ jobs:
run: |
yarn format

- name: Install EdgeDB
- name: Install Gel
uses: edgedb/setup-edgedb@6763b6de72782d9c2e5ecc1095986a1c707da68f
with:
instance-name: test
server-version: ${{ matrix.edgedb-version }}
server-version: ${{ matrix.gel-version }}

- name: Show actual EdgeDB server version
- name: Show actual Gel server version
run: |
echo ACTIVE_EDGEDB_VERSION=$(edgedb query 'select sys::get_version_as_str()' -I test) >> $GITHUB_ENV
echo ACTIVE_GEL_VERSION=$(gel query 'select sys::get_version_as_str()' -I test) >> $GITHUB_ENV

- name: Run package tests
run: |
yarn ci:test

- name: Run query builder integration tests lts
if: ${{ matrix.edgedb-version == '3' || matrix.edgedb-version == '4' || matrix.edgedb-version == 'stable' || matrix.edgedb-version == 'nightly' }}
if: ${{ matrix.gel-version == '3' || matrix.gel-version == '4' || matrix.gel-version == 'stable' || matrix.gel-version == 'nightly' }}
run: |
turbo run ci:integration-test --filter=@edgedb/integration-lts
turbo run bench:types --filter=@edgedb/integration-lts || echo "Benchmark types script failed, proceeding anyway."
turbo run ci:integration-test --filter=@gel/integration-lts
turbo run bench:types --filter=@gel/integration-lts || echo "Benchmark types script failed, proceeding anyway."

- name: Run query builder integration tests stable
if: ${{ matrix.edgedb-version == 'stable' || matrix.edgedb-version == 'nightly' }}
if: ${{ matrix.gel-version == 'stable' || matrix.gel-version == 'nightly' }}
run: |
turbo run ci:integration-test --filter=@edgedb/integration-stable
turbo run ci:integration-test --filter=@gel/integration-stable

- name: Run query builder integration tests nightly
if: ${{ matrix.edgedb-version == 'nightly' }}
if: ${{ matrix.gel-version == 'nightly' }}
run: |
turbo run ci:integration-test --filter=@edgedb/integration-nightly
turbo run ci:integration-test --filter=@gel/integration-nightly

- name: Typecheck other packages
run: |
Expand Down Expand Up @@ -144,28 +144,28 @@ jobs:

- name: Build and pack CLI wrapper
run: |
yarn workspace edgedb run build
yarn workspace edgedb pack --filename=${{ github.workspace }}/edgedb-cli.tar.gz
yarn workspace gel run build
yarn workspace gel pack --filename=${{ github.workspace }}/edgedb-cli.tar.gz

- name: Test CLI wrapper with npm
run: |
mkdir ${{ runner.temp }}/temp-npm
cd ${{ runner.temp }}/temp-npm
npm init -y
npm install ${{ github.workspace }}/edgedb-cli.tar.gz
npm exec edgedb -- project init --non-interactive
npm exec edgedb -- --version
npm exec edgedb -- query 'select sys::get_version_as_str()'
npm exec gel -- project init --non-interactive
npm exec gel -- --version
npm exec gel -- query 'select sys::get_version_as_str()'

- name: Test CLI wrapper with yarn
run: |
mkdir ${{ runner.temp }}/temp-yarn
cd ${{ runner.temp }}/temp-yarn
yarn init -y
yarn add ${{ github.workspace}}/edgedb-cli.tar.gz
yarn edgedb project init --non-interactive
yarn edgedb --version
yarn edgedb query 'select sys::get_version_as_str()'
yarn gel project init --non-interactive
yarn gel --version
yarn gel query 'select sys::get_version_as_str()'

- uses: threeal/setup-yarn-action@ec8c075e62bc497968de40011c2b766f5e8f1ac5
with:
Expand All @@ -179,9 +179,9 @@ jobs:
yarn init -y
touch yarn.lock
yarn add ${{ github.workspace }}/edgedb-cli.tar.gz
yarn edgedb project init --non-interactive
yarn edgedb --version
yarn edgedb query 'select sys::get_version_as_str()'
yarn gel project init --non-interactive
yarn gel --version
yarn gel query 'select sys::get_version_as_str()'

- uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d
with:
Expand All @@ -193,9 +193,9 @@ jobs:
cd ${{ runner.temp}}/temp-pnpm
pnpm init
pnpm add ${{ github.workspace }}/edgedb-cli.tar.gz
pnpm exec edgedb project init --non-interactive
pnpm exec edgedb --version
pnpm exec edgedb query 'select sys::get_version_as_str()'
pnpm exec gel project init --non-interactive
pnpm exec gel --version
pnpm exec gel query 'select sys::get_version_as_str()'

- uses: oven-sh/setup-bun@8f24390df009a496891208e5e36b8a1de1f45135
- name: Test CLI wrapper with bun
Expand All @@ -204,6 +204,6 @@ jobs:
cd temp-bun
bun init
bun add ${{ github.workspace }}/edgedb-cli.tar.gz
bun edgedb project init --non-interactive
bun edgedb --version
bun edgedb query 'select sys::get_version_as_str()'
bun gel project init --non-interactive
bun gel --version
bun gel query 'select sys::get_version_as_str()'
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
dist
packages/deno
/.bench
/.vscode
node_modules
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
packages/driver/test/shared-client-testcases/
Loading
Loading