From f33ebf47cf9ae6eebef2f97a1f11c5ed84da710b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alja=C5=BE=20Mur=20Er=C5=BEen?= <aljaz@edgedb.com>
Date: Wed, 29 May 2024 17:46:25 +0200
Subject: [PATCH] don't use language-server branch anymore

---
 integration/linux/build/centos-7/Dockerfile          | 2 +-
 integration/linux/build/centos-8/Dockerfile          | 2 +-
 integration/linux/build/debian-bookworm/Dockerfile   | 2 +-
 integration/linux/build/debian-bullseye/Dockerfile   | 2 +-
 integration/linux/build/debian-buster/Dockerfile     | 2 +-
 integration/linux/build/entrypoint.sh                | 2 +-
 integration/linux/build/fedora-29/Dockerfile         | 2 +-
 integration/linux/build/linux-aarch64/Dockerfile     | 2 +-
 integration/linux/build/linux-x86_64/Dockerfile      | 2 +-
 integration/linux/build/linuxmusl-aarch64/Dockerfile | 2 +-
 integration/linux/build/linuxmusl-x86_64/Dockerfile  | 2 +-
 integration/linux/build/rockylinux-9/Dockerfile      | 2 +-
 integration/linux/build/ubuntu-bionic/Dockerfile     | 2 +-
 integration/linux/build/ubuntu-focal/Dockerfile      | 2 +-
 integration/linux/build/ubuntu-hirsute/Dockerfile    | 2 +-
 integration/linux/build/ubuntu-jammy/Dockerfile      | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/integration/linux/build/centos-7/Dockerfile b/integration/linux/build/centos-7/Dockerfile
index b500ddf..a5ced9d 100644
--- a/integration/linux/build/centos-7/Dockerfile
+++ b/integration/linux/build/centos-7/Dockerfile
@@ -220,7 +220,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/centos-8/Dockerfile b/integration/linux/build/centos-8/Dockerfile
index 61b5583..bfb9a92 100644
--- a/integration/linux/build/centos-8/Dockerfile
+++ b/integration/linux/build/centos-8/Dockerfile
@@ -220,7 +220,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/debian-bookworm/Dockerfile b/integration/linux/build/debian-bookworm/Dockerfile
index 3fd93e1..7171f94 100644
--- a/integration/linux/build/debian-bookworm/Dockerfile
+++ b/integration/linux/build/debian-bookworm/Dockerfile
@@ -171,7 +171,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/debian-bullseye/Dockerfile b/integration/linux/build/debian-bullseye/Dockerfile
index 492d360..0e21365 100644
--- a/integration/linux/build/debian-bullseye/Dockerfile
+++ b/integration/linux/build/debian-bullseye/Dockerfile
@@ -171,7 +171,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/debian-buster/Dockerfile b/integration/linux/build/debian-buster/Dockerfile
index 6f2a052..4ad9a1f 100644
--- a/integration/linux/build/debian-buster/Dockerfile
+++ b/integration/linux/build/debian-buster/Dockerfile
@@ -171,7 +171,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/entrypoint.sh b/integration/linux/build/entrypoint.sh
index 8565a6d..5bde044 100755
--- a/integration/linux/build/entrypoint.sh
+++ b/integration/linux/build/entrypoint.sh
@@ -10,7 +10,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"
 
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg
 
 if [ -n "${METAPKG_PATH}" ]; then
     p=$(python -c 'import metapkg;print(metapkg.__path__[0])')
diff --git a/integration/linux/build/fedora-29/Dockerfile b/integration/linux/build/fedora-29/Dockerfile
index d472c08..87308e9 100644
--- a/integration/linux/build/fedora-29/Dockerfile
+++ b/integration/linux/build/fedora-29/Dockerfile
@@ -122,7 +122,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/linux-aarch64/Dockerfile b/integration/linux/build/linux-aarch64/Dockerfile
index da65e4e..9acd88b 100644
--- a/integration/linux/build/linux-aarch64/Dockerfile
+++ b/integration/linux/build/linux-aarch64/Dockerfile
@@ -252,7 +252,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/linux-x86_64/Dockerfile b/integration/linux/build/linux-x86_64/Dockerfile
index da65e4e..9acd88b 100644
--- a/integration/linux/build/linux-x86_64/Dockerfile
+++ b/integration/linux/build/linux-x86_64/Dockerfile
@@ -252,7 +252,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/linuxmusl-aarch64/Dockerfile b/integration/linux/build/linuxmusl-aarch64/Dockerfile
index 0eaa196..6e88f1e 100644
--- a/integration/linux/build/linuxmusl-aarch64/Dockerfile
+++ b/integration/linux/build/linuxmusl-aarch64/Dockerfile
@@ -53,7 +53,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/linuxmusl-x86_64/Dockerfile b/integration/linux/build/linuxmusl-x86_64/Dockerfile
index 0eaa196..6e88f1e 100644
--- a/integration/linux/build/linuxmusl-x86_64/Dockerfile
+++ b/integration/linux/build/linuxmusl-x86_64/Dockerfile
@@ -53,7 +53,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/rockylinux-9/Dockerfile b/integration/linux/build/rockylinux-9/Dockerfile
index 461488f..1c387d9 100644
--- a/integration/linux/build/rockylinux-9/Dockerfile
+++ b/integration/linux/build/rockylinux-9/Dockerfile
@@ -119,7 +119,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/ubuntu-bionic/Dockerfile b/integration/linux/build/ubuntu-bionic/Dockerfile
index 963a709..354f9f9 100644
--- a/integration/linux/build/ubuntu-bionic/Dockerfile
+++ b/integration/linux/build/ubuntu-bionic/Dockerfile
@@ -171,7 +171,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/ubuntu-focal/Dockerfile b/integration/linux/build/ubuntu-focal/Dockerfile
index c37af9b..4b13972 100644
--- a/integration/linux/build/ubuntu-focal/Dockerfile
+++ b/integration/linux/build/ubuntu-focal/Dockerfile
@@ -171,7 +171,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/ubuntu-hirsute/Dockerfile b/integration/linux/build/ubuntu-hirsute/Dockerfile
index 99d4545..b9543ff 100644
--- a/integration/linux/build/ubuntu-hirsute/Dockerfile
+++ b/integration/linux/build/ubuntu-hirsute/Dockerfile
@@ -171,7 +171,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\
diff --git a/integration/linux/build/ubuntu-jammy/Dockerfile b/integration/linux/build/ubuntu-jammy/Dockerfile
index 1db72d8..6b882fa 100644
--- a/integration/linux/build/ubuntu-jammy/Dockerfile
+++ b/integration/linux/build/ubuntu-jammy/Dockerfile
@@ -171,7 +171,7 @@ rm -rf "${CARGO_HOME}"/{git,registry}\n\
 ln -s ~/.cache/cargo/registry "${CARGO_HOME}/registry"\n\
 ln -s ~/.cache/cargo/git "${CARGO_HOME}/git"\n\
 \n\
-python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\
+python -m pip install -U git+https://github.com/edgedb/edgedb-pkg\n\
 \n\
 if [ -n "${METAPKG_PATH}" ]; then\n\
     p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\