Skip to content

Commit

Permalink
gh action: override edgedb-pkg branch to language-server (revert befo…
Browse files Browse the repository at this point in the history 
…re merging)
  • Loading branch information
@aljazerzen
aljazerzen committed May 24, 2024
1 parent a64164e commit 36171d7
Show file tree
Hide file tree
Showing 17 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions integration/linux/build/centos-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\
Expand Down
4 changes: 2 additions & 2 deletions integration/linux/build/centos-8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\
Expand Down
4 changes: 2 additions & 2 deletions integration/linux/build/debian-bookworm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\
Expand Down
4 changes: 2 additions & 2 deletions integration/linux/build/debian-bullseye/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\
Expand Down
4 changes: 2 additions & 2 deletions integration/linux/build/debian-buster/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion integration/linux/build/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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])')
Expand Down
4 changes: 2 additions & 2 deletions integration/linux/build/fedora-29/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\
Expand Down
6 changes: 3 additions & 3 deletions integration/linux/build/linux-aarch64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down Expand Up @@ -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\
Expand Down
4 changes: 2 additions & 2 deletions integration/linux/build/linux-x86_64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion integration/linux/build/linuxmusl-aarch64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion integration/linux/build/linuxmusl-x86_64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion integration/linux/build/rockylinux-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down
4 changes: 2 additions & 2 deletions integration/linux/build/ubuntu-bionic/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\
Expand Down
4 changes: 2 additions & 2 deletions integration/linux/build/ubuntu-focal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\
Expand Down
4 changes: 2 additions & 2 deletions integration/linux/build/ubuntu-hirsute/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\
Expand Down
4 changes: 2 additions & 2 deletions integration/linux/build/ubuntu-jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion integration/linux/test-systemd/debian-bookworm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM debian:bullseye
FROM debian:bookworm

ENV container docker

Expand Down

0 comments on commit 36171d7

Please sign in to comment.