From 5594197da516e2c3626950dac3db5105aab75cbf Mon Sep 17 00:00:00 2001
From: Thibault Charbonnier <thibaultcha@me.com>
Date: Tue, 22 Aug 2023 15:38:07 -0700
Subject: [PATCH] chore(act) fix CI runs & remove CI deps from Ubuntu 20.04

- 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.
---
 .../Dockerfiles/Dockerfile.ubuntu-20.04       | 20 -------------------
 .../Dockerfiles/Dockerfile.ubuntu-22.04       |  6 +++++-
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/assets/release/Dockerfiles/Dockerfile.ubuntu-20.04 b/assets/release/Dockerfiles/Dockerfile.ubuntu-20.04
index f1a8d5dab..f05bf74d6 100644
--- a/assets/release/Dockerfiles/Dockerfile.ubuntu-20.04
+++ b/assets/release/Dockerfiles/Dockerfile.ubuntu-20.04
@@ -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
diff --git a/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04 b/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04
index a5d6447d0..84fc38d20 100644
--- a/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04
+++ b/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04
@@ -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 \
@@ -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 && \