From ec9a770f5bc29313f9881ae039c3b5e9ace7392f Mon Sep 17 00:00:00 2001 From: Thomas Hobson Date: Tue, 16 Mar 2021 08:24:43 +1300 Subject: [PATCH 1/7] 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/7] 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/7] 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 From 9b1e4871563b9a5c0248b67f1b873d058dd93be2 Mon Sep 17 00:00:00 2001 From: Dan Vargas Date: Sat, 13 Mar 2021 20:57:52 -0600 Subject: [PATCH 4/7] pkg(erlang-23.0.0): Added erlang (escript) 23.0.0 --- packages/erlang/23.0.0/build.sh | 21 +++++++++++++++++++++ packages/erlang/23.0.0/environment | 4 ++++ packages/erlang/23.0.0/metadata.json | 6 ++++++ packages/erlang/23.0.0/run | 4 ++++ packages/erlang/23.0.0/test.erl | 3 +++ 5 files changed, 38 insertions(+) create mode 100755 packages/erlang/23.0.0/build.sh create mode 100644 packages/erlang/23.0.0/environment create mode 100644 packages/erlang/23.0.0/metadata.json create mode 100644 packages/erlang/23.0.0/run create mode 100644 packages/erlang/23.0.0/test.erl diff --git a/packages/erlang/23.0.0/build.sh b/packages/erlang/23.0.0/build.sh new file mode 100755 index 0000000..f282bc2 --- /dev/null +++ b/packages/erlang/23.0.0/build.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +PREFIX=$(realpath $(dirname $0)) + +mkdir -p build + +cd build + +curl "http://erlang.org/download/otp_src_23.0.tar.gz" -o erlang.tar.gz +tar xzf erlang.tar.gz --strip-components=1 +rm erlang.tar.gz + +export ERL_TOP=$(pwd) +./configure --prefix "$PREFIX" +make -j$(nproc) +make install -j$(nproc) + +cd .. + +rm -rf build + diff --git a/packages/erlang/23.0.0/environment b/packages/erlang/23.0.0/environment new file mode 100644 index 0000000..780b668 --- /dev/null +++ b/packages/erlang/23.0.0/environment @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# Put 'export' statements here for environment variables +export PATH=$PWD/bin:$PATH diff --git a/packages/erlang/23.0.0/metadata.json b/packages/erlang/23.0.0/metadata.json new file mode 100644 index 0000000..d035d40 --- /dev/null +++ b/packages/erlang/23.0.0/metadata.json @@ -0,0 +1,6 @@ +{ + "language": "erlang", + "version": "23.0.0", + "author": "Dan Vargas ", + "aliases": ["erlang", "erl", "escript"] +} \ No newline at end of file diff --git a/packages/erlang/23.0.0/run b/packages/erlang/23.0.0/run new file mode 100644 index 0000000..135d9f4 --- /dev/null +++ b/packages/erlang/23.0.0/run @@ -0,0 +1,4 @@ +#!/bin/bash + +# Put instructions to run the runtime +escript "$@" \ No newline at end of file diff --git a/packages/erlang/23.0.0/test.erl b/packages/erlang/23.0.0/test.erl new file mode 100644 index 0000000..d898d2c --- /dev/null +++ b/packages/erlang/23.0.0/test.erl @@ -0,0 +1,3 @@ + +main(_) -> + io:format("OK~n"). \ No newline at end of file From d64a2667dc24860af87f65ec2b62e0f7f561a7a4 Mon Sep 17 00:00:00 2001 From: Dan Vargas Date: Mon, 15 Mar 2021 11:36:50 -0500 Subject: [PATCH 5/7] pkg(elixir-1.11.3): Added elixir 1.11.3 --- packages/elixir/1.11.3/build.sh | 25 +++++++++++++++++++++++++ packages/elixir/1.11.3/environment | 4 ++++ packages/elixir/1.11.3/metadata.json | 6 ++++++ packages/elixir/1.11.3/run | 4 ++++ packages/elixir/1.11.3/test.exs | 1 + 5 files changed, 40 insertions(+) create mode 100755 packages/elixir/1.11.3/build.sh create mode 100644 packages/elixir/1.11.3/environment create mode 100644 packages/elixir/1.11.3/metadata.json create mode 100644 packages/elixir/1.11.3/run create mode 100644 packages/elixir/1.11.3/test.exs diff --git a/packages/elixir/1.11.3/build.sh b/packages/elixir/1.11.3/build.sh new file mode 100755 index 0000000..9328d8c --- /dev/null +++ b/packages/elixir/1.11.3/build.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +source ../../erlang/23.0.0/build.sh + +export PATH=$PWD/bin:$PATH + +PREFIX=$(realpath $(dirname $0)) + +mkdir -p build + +cd build + +curl -L "https://github.com/elixir-lang/elixir/archive/v1.11.3.tar.gz" -o elixir.tar.gz +tar xzf elixir.tar.gz --strip-components=1 +rm elixir.tar.gz + +./configure --prefix "$PREFIX" +make -j$(nproc) + +cd .. + +cp -r build/bin . +cp -r build/lib . + +rm -rf build diff --git a/packages/elixir/1.11.3/environment b/packages/elixir/1.11.3/environment new file mode 100644 index 0000000..780b668 --- /dev/null +++ b/packages/elixir/1.11.3/environment @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# Put 'export' statements here for environment variables +export PATH=$PWD/bin:$PATH diff --git a/packages/elixir/1.11.3/metadata.json b/packages/elixir/1.11.3/metadata.json new file mode 100644 index 0000000..6349e0e --- /dev/null +++ b/packages/elixir/1.11.3/metadata.json @@ -0,0 +1,6 @@ +{ + "language": "elixir", + "version": "1.11.3", + "author": "Dan Vargas ", + "aliases": ["elixir", "exs"] +} \ No newline at end of file diff --git a/packages/elixir/1.11.3/run b/packages/elixir/1.11.3/run new file mode 100644 index 0000000..9b3ba9c --- /dev/null +++ b/packages/elixir/1.11.3/run @@ -0,0 +1,4 @@ +#!/bin/bash + +# Put instructions to run the runtime +elixir "$@" \ No newline at end of file diff --git a/packages/elixir/1.11.3/test.exs b/packages/elixir/1.11.3/test.exs new file mode 100644 index 0000000..bc837c6 --- /dev/null +++ b/packages/elixir/1.11.3/test.exs @@ -0,0 +1 @@ +IO.puts("OK") \ No newline at end of file From 9b305c7995be07a681805675f09c202453e91563 Mon Sep 17 00:00:00 2001 From: Dan Vargas Date: Mon, 15 Mar 2021 12:53:44 -0500 Subject: [PATCH 6/7] pkg(osabie-1.0.1): Added osabie 1.0.1 --- packages/osabie/1.0.1/build.sh | 23 +++++++++++++++++++++++ packages/osabie/1.0.1/environment | 4 ++++ packages/osabie/1.0.1/metadata.json | 6 ++++++ packages/osabie/1.0.1/run | 4 ++++ packages/osabie/1.0.1/test.osabie | 1 + 5 files changed, 38 insertions(+) create mode 100755 packages/osabie/1.0.1/build.sh create mode 100644 packages/osabie/1.0.1/environment create mode 100644 packages/osabie/1.0.1/metadata.json create mode 100644 packages/osabie/1.0.1/run create mode 100644 packages/osabie/1.0.1/test.osabie diff --git a/packages/osabie/1.0.1/build.sh b/packages/osabie/1.0.1/build.sh new file mode 100755 index 0000000..8914444 --- /dev/null +++ b/packages/osabie/1.0.1/build.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +source ../../elixir/1.11.3/build.sh + +export PATH=$PWD/bin:$PATH + +PREFIX=$(realpath $(dirname $0)) + +mkdir -p build + +cd build + +git clone 'https://github.com/Adriandmen/05AB1E.git' . +mix local.hex --force +mix local.rebar --force +mix deps.get --force +MIX_ENV=prod mix escript.build --force + +cd .. + +cp -r build/* bin + +rm -rf build diff --git a/packages/osabie/1.0.1/environment b/packages/osabie/1.0.1/environment new file mode 100644 index 0000000..780b668 --- /dev/null +++ b/packages/osabie/1.0.1/environment @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# Put 'export' statements here for environment variables +export PATH=$PWD/bin:$PATH diff --git a/packages/osabie/1.0.1/metadata.json b/packages/osabie/1.0.1/metadata.json new file mode 100644 index 0000000..140965f --- /dev/null +++ b/packages/osabie/1.0.1/metadata.json @@ -0,0 +1,6 @@ +{ + "language": "osabie", + "version": "1.0.1", + "author": "Dan Vargas ", + "aliases": ["osabie", "05AB1E", "usable"] +} \ No newline at end of file diff --git a/packages/osabie/1.0.1/run b/packages/osabie/1.0.1/run new file mode 100644 index 0000000..2f99ab0 --- /dev/null +++ b/packages/osabie/1.0.1/run @@ -0,0 +1,4 @@ +#!/bin/bash + +# Put instructions to run the runtime +osabie "$@" \ No newline at end of file diff --git a/packages/osabie/1.0.1/test.osabie b/packages/osabie/1.0.1/test.osabie new file mode 100644 index 0000000..4a7ac92 --- /dev/null +++ b/packages/osabie/1.0.1/test.osabie @@ -0,0 +1 @@ +"OK From 567809ed42e39590a4a504ce3887b48529f81787 Mon Sep 17 00:00:00 2001 From: Dan Vargas Date: Mon, 15 Mar 2021 12:57:46 -0500 Subject: [PATCH 7/7] pkg(ruby-2.5.1): Fix runner args ref --- packages/ruby/2.5.1/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ruby/2.5.1/run b/packages/ruby/2.5.1/run index 0512583..ae76e5f 100644 --- a/packages/ruby/2.5.1/run +++ b/packages/ruby/2.5.1/run @@ -1,3 +1,3 @@ #!/bin/bash -ruby $* \ No newline at end of file +ruby "$@" \ No newline at end of file