File 3661-gh-Add-proper-and-jsx-as-deps-for-testing.... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3661-gh-Add-proper-and-jsx-as-deps-for-testing.patch of Package erlang (Revision da0f8958cbfdaccc567b3effd8dde26d)

Currently displaying revision da0f8958cbfdaccc567b3effd8dde26d , Show latest

From d73455310d5fe30a09b8129431a120afc4032f8b Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 17 Jun 2022 10:35:07 +0200
Subject: [PATCH 1/2] gh: Add proper and jsx as deps for testing

---
 .github/dockerfiles/Dockerfile.64-bit      | 18 ++++++++++++++++++
 .github/dockerfiles/Dockerfile.ubuntu-base |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.github/dockerfiles/Dockerfile.64-bit b/.github/dockerfiles/Dockerfile.64-bit
index 87bcd61659..2556dc0103 100644
--- a/.github/dockerfiles/Dockerfile.64-bit
+++ b/.github/dockerfiles/Dockerfile.64-bit
@@ -22,3 +22,21 @@ RUN  ./configure --prefix=/otp && \
 
 ## Disable -Werror as testcases do not compile with it on
 ENV CFLAGS="-O2 -g"
+
+WORKDIR /buildroot/
+
+## Install test tools rebar3, proper and jsx
+RUN latest () { \
+    local VSN=$(curl -sL "https://api.github.com/repos/$1/tags" | jq -r ".[] | .name" | grep -E '^v?[0-9]' | sort -V | tail -1); \
+    curl -sL "https://github.com/$1/archive/$VSN.tar.gz" > $(basename $1).tar.gz; \
+    } && \
+    latest erlang/rebar3 && ls -la && \
+    (tar xzf rebar3.tar.gz && cd rebar3-* && ./bootstrap && sudo cp rebar3 /usr/bin) && \
+    latest proper-testing/proper && \
+    (tar xzf proper.tar.gz && mv proper-* proper && cd proper && make) && \
+    latest talentdeficit/jsx && \
+    (tar xzf jsx.tar.gz && mv jsx-* jsx && cd jsx && rebar3 compile)
+
+ENV ERL_LIBS=/buildroot/proper:/buildroot/jsx
+
+WORKDIR /buildroot/otp/
diff --git a/.github/dockerfiles/Dockerfile.ubuntu-base b/.github/dockerfiles/Dockerfile.ubuntu-base
index 913e6ec19e..7a0e97506a 100644
--- a/.github/dockerfiles/Dockerfile.ubuntu-base
+++ b/.github/dockerfiles/Dockerfile.ubuntu-base
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get -y upgrade && \
     default-jdk libxml2-utils flex pkg-config \
     unixodbc odbc-postgresql postgresql \
     tzdata ssh openssh-server groff-base sudo gdb apache2 tinyproxy bind9 nsd expect vsftpd python \
-    linux-tools-common linux-tools-generic linux-tools-`uname -r` \
+    linux-tools-common linux-tools-generic linux-tools-`uname -r` curl jq \
     ${INSTALL_LIBS} && \
     for lib in ${EXTRA_LIBS}; do apt-get install -y ${lib}; done && \
     sed -i 's@# en_US.UTF-8@en_US.UTF-8@g' /etc/locale.gen && locale-gen && \
-- 
2.35.3

Places

File 3661-gh-Add-proper-and-jsx-as-deps-for-testing.patch of Package erlang (Revision da0f8958cbfdaccc567b3effd8dde26d)

Places