Skip to content

Commit

Permalink
Switch to expecting the CLI to be named gel (#8385)
Browse files Browse the repository at this point in the history
Another one of these terrible breaking changes for the server/CLI
build dep.
  • Loading branch information
msullivan authored Feb 25, 2025
1 parent 2e259ca commit c1d8fa1
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 53 deletions.
8 changes: 4 additions & 4 deletions .github/workflows.src/tests.inc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
CACHE_HIT: ${{ steps.cli-cache.outputs.cache-hit }}
run: |
if [[ "$CACHE_HIT" == "true" ]]; then
cp -v build/cli/bin/edgedb edb/cli/edgedb
cp -v build/cli/bin/gel edb/cli/gel
else
python setup.py -v build_cli
fi
Expand Down Expand Up @@ -423,7 +423,7 @@
- name: Validate cached binaries
run: |
# Validate EdgeDB CLI
./build/cli/bin/edgedb --version || exit 1
./build/cli/bin/gel --version || exit 1
# Validate Stolon
./build/stolon/bin/stolon-sentinel --version || exit 1
Expand All @@ -436,8 +436,8 @@
- name: Restore cache into the source tree
run: |
cp -v build/cli/bin/edgedb edb/cli/edgedb
cp -v build/cli/bin/edgedb edb/cli/gel
cp -v build/cli/bin/gel edb/cli/edgedb
cp -v build/cli/bin/gel edb/cli/gel
rsync -av ./build/rust_extensions/edb/ ./edb/
rsync -av ./build/extensions/edb/ ./edb/
rsync -av ./build/lib/edb/ ./edb/
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests-ha.yml

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

14 changes: 7 additions & 7 deletions .github/workflows/tests-inplace.yml

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

32 changes: 16 additions & 16 deletions .github/workflows/tests-managed-pg.yml

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

8 changes: 4 additions & 4 deletions .github/workflows/tests-patches.yml

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

8 changes: 4 additions & 4 deletions .github/workflows/tests-pg-versions.yml

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

2 changes: 1 addition & 1 deletion .github/workflows/tests-pool.yml

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

8 changes: 4 additions & 4 deletions .github/workflows/tests-reflection.yml

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

14 changes: 7 additions & 7 deletions .github/workflows/tests.yml

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

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ def _compile_cli(build_base, build_temp):
args = [
'cargo', 'install',
'--verbose', '--verbose',
'--bin', 'edgedb',
'--bin', 'gel',
'--root', rust_root,
'--features=dev_mode',
'--locked',
Expand Down Expand Up @@ -564,7 +564,7 @@ def _compile_cli(build_base, build_temp):
pass

shutil.copy(
rust_root / 'bin' / 'edgedb',
rust_root / 'bin' / 'gel',
cli_dest,
)

Expand Down

0 comments on commit c1d8fa1

Please sign in to comment.