Skip to content

Commit

Permalink
chore(act) fix CI runs & remove CI deps from Ubuntu 20.04
Browse files Browse the repository at this point in the history
- Fix CI runs by also installing unzip for LuaRocks in OpenResty jobs.
- Remove act & CI dependencies from Ubuntu 20.04 since it moved to the
  22.04 image.
  • Loading branch information
thibaultcha committed Aug 23, 2023
1 parent a0eee46 commit 5594197
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 21 deletions.
20 changes: 0 additions & 20 deletions assets/release/Dockerfiles/Dockerfile.ubuntu-20.04
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,3 @@ ENV PATH $CARGO_HOME/bin:$PATH
RUN mkdir -p "$CARGO_HOME" && mkdir -p "$RUSTUP_HOME" && \
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable && \
chmod -R a=rwX $CARGO_HOME $RUSTUP_HOME

RUN /bin/bash -c 'echo $(uname -m) > /TG_ARCH || : ; \
[[ $(cat /TG_ARCH) == "x86_64" ]] && echo "amd64" > /TG_ARCH || : ; \
[[ $(cat /TG_ARCH) == "aarch64" ]] && echo "arm64" > /TG_ARCH || :'

# Note: this image is also used for local CI runs, install additional dependencies
RUN apt-get install -y \
clang-tools \
libpcre3-dev \
libssl-dev \
zlib1g-dev \
valgrind \
nodejs \
gcovr \
sudo && \
curl -sLO https://golang.google.cn/dl/go${GOLANG_VERSION}.linux-$(cat /TG_ARCH).tar.gz && \
sudo rm -rf /usr/local/go && tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-$(cat /TG_ARCH).tar.gz && \
curl -sLO https://github.com/tinygo-org/tinygo/releases/download/v$TINYGO_VERSION/tinygo_${TINYGO_VERSION}_$(cat /TG_ARCH).deb && \
dpkg -i tinygo_${TINYGO_VERSION}_$(cat /TG_ARCH).deb
ENV PATH $PATH:/usr/local/go/bin
6 changes: 5 additions & 1 deletion assets/release/Dockerfiles/Dockerfile.ubuntu-22.04
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ RUN /bin/bash -c 'echo $(uname -m) > /TG_ARCH || : ; \
[[ $(cat /TG_ARCH) == "x86_64" ]] && echo "amd64" > /TG_ARCH || : ; \
[[ $(cat /TG_ARCH) == "aarch64" ]] && echo "arm64" > /TG_ARCH || :'

# Note: this image is also used for local CI runs, install additional dependencies
# Note: this image is also used for local CI runs, install additional
# dependencies
#
# unzip: LuaRocks
RUN apt-get install -y \
clang-tools \
libpcre3-dev \
Expand All @@ -40,6 +43,7 @@ RUN apt-get install -y \
valgrind \
nodejs \
gcovr \
unzip \
sudo && \
curl -sLO https://golang.google.cn/dl/go${GOLANG_VERSION}.linux-$(cat /TG_ARCH).tar.gz && \
sudo rm -rf /usr/local/go && tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-$(cat /TG_ARCH).tar.gz && \
Expand Down

0 comments on commit 5594197

Please sign in to comment.