diff --git a/integration/linux/build/centos-7/Dockerfile b/integration/linux/build/centos-7/Dockerfile index 09110838..b500ddfe 100644 --- a/integration/linux/build/centos-7/Dockerfile +++ b/integration/linux/build/centos-7/Dockerfile @@ -34,7 +34,7 @@ RUN ulimit -n 1024 \ ENV GPG_KEY %%PLACEHOLDER%% -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV GIT_VERSION 2.20.1 ENV TAR_VERSION latest ENV RUSTUP_HOME /usr/local/rustup @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 bb27d468..61b55839 100644 --- a/integration/linux/build/centos-8/Dockerfile +++ b/integration/linux/build/centos-8/Dockerfile @@ -34,7 +34,7 @@ RUN ulimit -n 1024 \ ENV GPG_KEY %%PLACEHOLDER%% -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV GIT_VERSION 2.20.1 ENV TAR_VERSION latest ENV RUSTUP_HOME /usr/local/rustup @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 b04fd69f..3fd93e1c 100644 --- a/integration/linux/build/debian-bookworm/Dockerfile +++ b/integration/linux/build/debian-bookworm/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ zstd \ && rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV RUSTUP_HOME /usr/local/rustup ENV CARGO_HOME /usr/local/cargo ENV PATH /usr/local/cargo/bin:$PATH @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 a7024880..492d3600 100644 --- a/integration/linux/build/debian-bullseye/Dockerfile +++ b/integration/linux/build/debian-bullseye/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ zstd \ && rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV RUSTUP_HOME /usr/local/rustup ENV CARGO_HOME /usr/local/cargo ENV PATH /usr/local/cargo/bin:$PATH @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 afe02cfc..6f2a0520 100644 --- a/integration/linux/build/debian-buster/Dockerfile +++ b/integration/linux/build/debian-buster/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ zstd \ && rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV RUSTUP_HOME /usr/local/rustup ENV CARGO_HOME /usr/local/cargo ENV PATH /usr/local/cargo/bin:$PATH @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 5bde044f..8565a6d4 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 +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server 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 e707a35d..d472c080 100644 --- a/integration/linux/build/fedora-29/Dockerfile +++ b/integration/linux/build/fedora-29/Dockerfile @@ -21,7 +21,7 @@ RUN yum install -y \ curl-devel xz-devel libffi-devel gettext glibc-langpack-en ENV GPG_KEY %%PLACEHOLDER%% -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV GIT_VERSION 2.20.1 ENV RUSTUP_HOME /usr/local/rustup ENV CARGO_HOME /usr/local/cargo @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 b980b5ff..da65e4e9 100644 --- a/integration/linux/build/linux-aarch64/Dockerfile +++ b/integration/linux/build/linux-aarch64/Dockerfile @@ -14,7 +14,7 @@ ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib" ENV LANG C ENV GPG_KEY %%PLACEHOLDER%% -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV GIT_VERSION 2.33.1 ENV PATCHELF_VERSION 0.13 ENV TAR_VERSION latest @@ -24,7 +24,7 @@ ENV GO_VERSION 1.21.6 ENV RUST_VERSION 1.76.0 ENV NODE_VERSION 16.16.0 ENV YARN_VERSION 1.22.19 -ENV GCC_VERSION 10 +ENV GCC_VERSION 11 # rpm on centos 7 iterates over all fds up to the limit, which is # extremely slow. Force it to be small. @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 806e4894..da65e4e9 100644 --- a/integration/linux/build/linux-x86_64/Dockerfile +++ b/integration/linux/build/linux-x86_64/Dockerfile @@ -14,7 +14,7 @@ ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib" ENV LANG C ENV GPG_KEY %%PLACEHOLDER%% -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV GIT_VERSION 2.33.1 ENV PATCHELF_VERSION 0.13 ENV TAR_VERSION latest @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 6e88f1e3..0eaa196c 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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 6e88f1e3..0eaa196c 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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 1c387d94..461488f5 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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 58c37851..963a7090 100644 --- a/integration/linux/build/ubuntu-bionic/Dockerfile +++ b/integration/linux/build/ubuntu-bionic/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ zstd \ && rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV RUSTUP_HOME /usr/local/rustup ENV CARGO_HOME /usr/local/cargo ENV PATH /usr/local/cargo/bin:$PATH @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 74348944..c37af9b2 100644 --- a/integration/linux/build/ubuntu-focal/Dockerfile +++ b/integration/linux/build/ubuntu-focal/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ zstd \ && rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV RUSTUP_HOME /usr/local/rustup ENV CARGO_HOME /usr/local/cargo ENV PATH /usr/local/cargo/bin:$PATH @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 df1753f4..99d4545d 100644 --- a/integration/linux/build/ubuntu-hirsute/Dockerfile +++ b/integration/linux/build/ubuntu-hirsute/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ zstd \ && rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV RUSTUP_HOME /usr/local/rustup ENV CARGO_HOME /usr/local/cargo ENV PATH /usr/local/cargo/bin:$PATH @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\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 a9f14595..1db72d88 100644 --- a/integration/linux/build/ubuntu-jammy/Dockerfile +++ b/integration/linux/build/ubuntu-jammy/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ zstd \ && rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.9.18 +ENV PYTHON_VERSION 3.9.19 ENV RUSTUP_HOME /usr/local/rustup ENV CARGO_HOME /usr/local/cargo ENV PATH /usr/local/cargo/bin:$PATH @@ -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\n\ +python -m pip install -U git+https://github.com/edgedb/edgedb-pkg@language-server\n\ \n\ if [ -n "${METAPKG_PATH}" ]; then\n\ p=$(python -c '\''import metapkg;print(metapkg.__path__[0])'\'')\n\ diff --git a/integration/linux/test-systemd/debian-bookworm/Dockerfile b/integration/linux/test-systemd/debian-bookworm/Dockerfile index 0ea4d3a0..40d1f141 100644 --- a/integration/linux/test-systemd/debian-bookworm/Dockerfile +++ b/integration/linux/test-systemd/debian-bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye +FROM debian:bookworm ENV container docker