From ec9a770f5bc29313f9881ae039c3b5e9ace7392f Mon Sep 17 00:00:00 2001 From: Thomas Hobson Date: Tue, 16 Mar 2021 08:24:43 +1300 Subject: [PATCH 1/3] ci(package): output result of test instead of just failing --- .github/workflows/package-pr.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package-pr.yaml b/.github/workflows/package-pr.yaml index 30c5cfd..6c3395d 100644 --- a/.github/workflows/package-pr.yaml +++ b/.github/workflows/package-pr.yaml @@ -123,7 +123,9 @@ jobs: do TEST_RUNTIME=$(awk -F. '{print $2}' <<< $(basename $tscript)) echo Running $tscript with runtime=$TEST_RUNTIME - docker run --network container:api -v "$PWD/cli:/app" -v "$PWD/$(dirname $tscript):/pkg" node:15 /app/index.js run $TEST_RUNTIME $PKG_VERSION /pkg/$(basename $tscript) | grep OK + docker run --network container:api -v "$PWD/cli:/app" -v "$PWD/$(dirname $tscript):/pkg" node:15 /app/index.js run $TEST_RUNTIME $PKG_VERSION /pkg/$(basename $tscript) > test_output + cat test_output + grep "OK" test_output done done From 2ebe1a33089d41a3187c64dc832cc33a42999c12 Mon Sep 17 00:00:00 2001 From: Dan Vargas Date: Mon, 15 Mar 2021 14:43:32 -0500 Subject: [PATCH 2/3] pkg(erlang-23.0.0): Add curses deps before adding lang --- repo/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo/Dockerfile b/repo/Dockerfile index 231289a..6c3053f 100644 --- a/repo/Dockerfile +++ b/repo/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster-slim -RUN apt-get update && apt-get install -y unzip autoconf build-essential libssl-dev pkg-config zlib1g-dev libargon2-dev libsodium-dev libcurl4-openssl-dev sqlite3 libsqlite3-dev libonig-dev libxml2 libxml2-dev bc curl git linux-headers-amd64 perl xz-utils python3 python3-pip gnupg jq zlib1g-dev cmake cmake-doc extra-cmake-modules build-essential gcc binutils bash coreutils util-linux pciutils usbutils coreutils binutils findutils grep && \ +RUN apt-get update && apt-get install -y unzip autoconf build-essential libssl-dev pkg-config zlib1g-dev libargon2-dev libsodium-dev libcurl4-openssl-dev sqlite3 libsqlite3-dev libonig-dev libxml2 libxml2-dev bc curl git linux-headers-amd64 perl xz-utils python3 python3-pip gnupg jq zlib1g-dev cmake cmake-doc extra-cmake-modules build-essential gcc binutils bash coreutils util-linux pciutils usbutils coreutils binutils findutils grep libncurses5-dev libncursesw5-dev && \ ln -sf /bin/bash /bin/sh && \ rm -rf /var/lib/apt/lists/* From 7837f1c7c0c645edc46831eb887815397e2dd740 Mon Sep 17 00:00:00 2001 From: Victor Frazao Date: Mon, 15 Mar 2021 13:51:38 -0400 Subject: [PATCH 3/3] Fix package init script to use "$@" in run file instead of "$*" --- packages/init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/init b/packages/init index 2bf65cc..5a0c9b9 100755 --- a/packages/init +++ b/packages/init @@ -54,7 +54,7 @@ echo "# Put 'export' statements here for environment variables" >> environment echo "export PATH=\$PWD/bin:\$PATH" >> environment echo "# Put instructions to run the runtime" >> run -echo "$NAME-$VERSION \$*" >> run +echo "$NAME-$VERSION \"\$@\"" >> run echo "# Put instructions to compile source code, remove this file if the language does not require this stage" >> compile @@ -62,4 +62,4 @@ jq '.language = "'$NAME'" | .version = "'$VERSION'" | .aliases = [] | .author = cd - > /dev/null -echo $DIR \ No newline at end of file +echo $DIR