From 2098340e2d66edd27d983726de8551261ba031ad Mon Sep 17 00:00:00 2001 From: Lunarmagpie Date: Fri, 10 Mar 2023 14:16:45 -0500 Subject: [PATCH 1/9] remove the first 3 lines of gleam stdout --- api/Dockerfile | 2 +- packages/gleam/0.27.0/run | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index 101a406..fa34112 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -8,7 +8,7 @@ RUN for i in $(seq 1001 1500); do \ useradd -M runner$i -g $i -u $i ; \ done RUN apt-get update && \ - apt-get install -y git libxml2 gnupg tar coreutils util-linux libc6-dev \ + apt-get install -y git gawk libxml2 gnupg tar coreutils util-linux libc6-dev \ binutils build-essential locales libpcre3-dev libevent-dev libgmp3-dev \ libncurses6 libncurses5 libedit-dev libseccomp-dev rename procps python3 \ libreadline-dev libblas-dev liblapack-dev libpcre3-dev libarpack2-dev \ diff --git a/packages/gleam/0.27.0/run b/packages/gleam/0.27.0/run index 4318bec..e98d01f 100755 --- a/packages/gleam/0.27.0/run +++ b/packages/gleam/0.27.0/run @@ -2,4 +2,4 @@ shift cd project -gleam run $(cat ../compile_args 2> /dev/null) -- "$@" +gleam run $(cat ../compile_args 2> /dev/null) -- "$@" | awk "NR>=3" From 33307d82c9adfdd53deb8c61788c166b501609dd Mon Sep 17 00:00:00 2001 From: Lunarmagpie Date: Fri, 10 Mar 2023 15:06:18 -0500 Subject: [PATCH 2/9] gawk was already installed --- api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/Dockerfile b/api/Dockerfile index fa34112..101a406 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -8,7 +8,7 @@ RUN for i in $(seq 1001 1500); do \ useradd -M runner$i -g $i -u $i ; \ done RUN apt-get update && \ - apt-get install -y git gawk libxml2 gnupg tar coreutils util-linux libc6-dev \ + apt-get install -y git libxml2 gnupg tar coreutils util-linux libc6-dev \ binutils build-essential locales libpcre3-dev libevent-dev libgmp3-dev \ libncurses6 libncurses5 libedit-dev libseccomp-dev rename procps python3 \ libreadline-dev libblas-dev liblapack-dev libpcre3-dev libarpack2-dev \ From c26a424bb090f8498a5071bab0a62761f5ebed7a Mon Sep 17 00:00:00 2001 From: Lunarmagpie Date: Fri, 10 Mar 2023 15:14:51 -0500 Subject: [PATCH 3/9] erlang had skill issue --- packages/erlang/23.0.0/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/erlang/23.0.0/build.sh b/packages/erlang/23.0.0/build.sh index f282bc2..adfee95 100755 --- a/packages/erlang/23.0.0/build.sh +++ b/packages/erlang/23.0.0/build.sh @@ -6,7 +6,7 @@ mkdir -p build cd build -curl "http://erlang.org/download/otp_src_23.0.tar.gz" -o erlang.tar.gz +curl "http://www.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 From d121cddc17893cd26803239046f9511a03e6f9a9 Mon Sep 17 00:00:00 2001 From: Lunarmagpie Date: Fri, 10 Mar 2023 20:31:29 -0500 Subject: [PATCH 4/9] Update build.sh --- packages/erlang/23.0.0/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/erlang/23.0.0/build.sh b/packages/erlang/23.0.0/build.sh index adfee95..bad5e05 100755 --- a/packages/erlang/23.0.0/build.sh +++ b/packages/erlang/23.0.0/build.sh @@ -6,7 +6,7 @@ mkdir -p build cd build -curl "http://www.erlang.org/download/otp_src_23.0.tar.gz" -o erlang.tar.gz +curl "https://github.com/erlang/otp/releases/download/OTP-23.0/otp_src_23.0.tar.gz" -o erlang.tar.gz tar xzf erlang.tar.gz --strip-components=1 rm erlang.tar.gz From 41df9639e8525a4ef789ba332b89d84866a92bc5 Mon Sep 17 00:00:00 2001 From: Lunarmagpie Date: Fri, 10 Mar 2023 20:37:52 -0500 Subject: [PATCH 5/9] Update build.sh --- packages/erlang/23.0.0/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/erlang/23.0.0/build.sh b/packages/erlang/23.0.0/build.sh index bad5e05..e549cc4 100755 --- a/packages/erlang/23.0.0/build.sh +++ b/packages/erlang/23.0.0/build.sh @@ -6,7 +6,7 @@ mkdir -p build cd build -curl "https://github.com/erlang/otp/releases/download/OTP-23.0/otp_src_23.0.tar.gz" -o erlang.tar.gz +curl "https://github.com/erlang/otp/releases/download/OTP-23.0/otp_src_23.0.tar.gz" -o erlang.tar.gz -L tar xzf erlang.tar.gz --strip-components=1 rm erlang.tar.gz From aba5bf15d4d127b1343ee15f08baa0fa7495c28c Mon Sep 17 00:00:00 2001 From: Lunarmagpie Date: Fri, 10 Mar 2023 20:57:33 -0500 Subject: [PATCH 6/9] clean gleam output --- packages/gleam/0.27.0/compile | 2 +- packages/gleam/0.27.0/run | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gleam/0.27.0/compile b/packages/gleam/0.27.0/compile index bd8e291..4ca21cb 100755 --- a/packages/gleam/0.27.0/compile +++ b/packages/gleam/0.27.0/compile @@ -1,6 +1,6 @@ #!/usr/bin/env bash -gleam new project --skip-git +gleam new project --skip-git > /dev/null mkdir project/build cp /piston/packages/gleam/0.27.0/project/manifest.toml project/manifest.toml cp /piston/packages/gleam/0.27.0/project/build/packages* project/build -r 2> /dev/null diff --git a/packages/gleam/0.27.0/run b/packages/gleam/0.27.0/run index e98d01f..c7ff839 100755 --- a/packages/gleam/0.27.0/run +++ b/packages/gleam/0.27.0/run @@ -2,4 +2,4 @@ shift cd project -gleam run $(cat ../compile_args 2> /dev/null) -- "$@" | awk "NR>=3" +gleam run $(cat ../compile_args 2> /dev/null) -- "$@" | awk "NR>=4" From f795ca52f0ca8c15c0ec5139420cb9c0a1d127f7 Mon Sep 17 00:00:00 2001 From: Lunarmagpie Date: Fri, 10 Mar 2023 21:12:49 -0500 Subject: [PATCH 7/9] AJEFIJEASOIF --- .github/workflows/package-pr.yaml | 1 + packages/gleam/0.27.0/build.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package-pr.yaml b/.github/workflows/package-pr.yaml index aa5c4df..adaa944 100644 --- a/.github/workflows/package-pr.yaml +++ b/.github/workflows/package-pr.yaml @@ -95,6 +95,7 @@ jobs: docker build -t piston-api api docker run --network container:repo -v $(pwd)'/data:/piston' -e PISTON_LOG_LEVEL=DEBUG -e 'PISTON_REPO_URL=http://localhost:8000/index' -d --name api piston-api echo Waiting for API to start.. + docker pull appropriate/curl docker run --network container:api appropriate/curl -s --retry 10 --retry-connrefused http://localhost:2000/api/v2/runtimes echo Waiting for Index to start.. diff --git a/packages/gleam/0.27.0/build.sh b/packages/gleam/0.27.0/build.sh index cda1f1d..e802b73 100755 --- a/packages/gleam/0.27.0/build.sh +++ b/packages/gleam/0.27.0/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Install Erlang -source ../../erlang/23.0.0/build.sh +# source ../../erlang/23.0.0/build.sh # Install Node source ../../node/16.3.0/build.sh From 8be44bd99c0a7804ceb73eebf860a31dfc0b6b16 Mon Sep 17 00:00:00 2001 From: Lunarmagpie Date: Fri, 10 Mar 2023 21:19:16 -0500 Subject: [PATCH 8/9] erlang --- packages/gleam/0.27.0/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gleam/0.27.0/build.sh b/packages/gleam/0.27.0/build.sh index e802b73..cda1f1d 100755 --- a/packages/gleam/0.27.0/build.sh +++ b/packages/gleam/0.27.0/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Install Erlang -# source ../../erlang/23.0.0/build.sh +source ../../erlang/23.0.0/build.sh # Install Node source ../../node/16.3.0/build.sh From 28a29ca7ed07c25f43fefed205f88d22d5e3bed5 Mon Sep 17 00:00:00 2001 From: Lunarmagpie Date: Mon, 13 Mar 2023 00:24:15 -0400 Subject: [PATCH 9/9] filter stdout for compiling as well --- packages/gleam/0.27.0/compile | 3 ++- packages/gleam/0.27.0/run | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/gleam/0.27.0/compile b/packages/gleam/0.27.0/compile index 4ca21cb..1b6a5bf 100755 --- a/packages/gleam/0.27.0/compile +++ b/packages/gleam/0.27.0/compile @@ -12,4 +12,5 @@ shift echo "$@" > compile_args cd project -gleam build "$@" +# Awk is used to remove lines from the output that don't help for the piston output. +gleam build "$@" | awk "NR>=4" diff --git a/packages/gleam/0.27.0/run b/packages/gleam/0.27.0/run index c7ff839..d4caade 100755 --- a/packages/gleam/0.27.0/run +++ b/packages/gleam/0.27.0/run @@ -2,4 +2,5 @@ shift cd project +# Awk is used to remove lines from the output that don't help for the piston output. gleam run $(cat ../compile_args 2> /dev/null) -- "$@" | awk "NR>=4"