From 1d57528328bc173ec94019c66d54386d30f739ae Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 11 Dec 2021 11:48:58 -0800 Subject: [PATCH 1/5] Sigh --- langs/ante.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/langs/ante.yaml b/langs/ante.yaml index e061695..539fd76 100644 --- a/langs/ante.yaml +++ b/langs/ante.yaml @@ -17,12 +17,12 @@ install: llvmenv init # If compiler is not explicitly set to LLVM, then we get an # error: unrecognized command-line option ‘-Wnewline-eof’. - CC=/usr/bin/clang CXX=/usr/bin/clang++ llvmenv build-entry -G Makefile -j$(nproc) 10.0.0 - llvmenv global 10.0.0 + CC=/usr/bin/clang CXX=/usr/bin/clang++ llvmenv build-entry -G Makefile -j$(nproc) 10.0.1 + llvmenv global 10.0.1 manual: | git clone https://github.com/jfecher/ante.git -n pushd ante - git checkout 6e61e9f7ed9300ed68f6b9459b69f027e09a0c42 + git checkout ba940f3b492fb448a6a73b139403eefa7a0daedc LLVM_SYS_100_PREFIX="$(llvmenv prefix)" cargo build --release install -d "${pkg}/opt/ante" install -d "${pkg}/usr/local/bin" From 8e97a846adec516c2a551d1254f140604e68ee48 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 11 Dec 2021 11:53:41 -0800 Subject: [PATCH 2/5] Aaaaaaaaaaaaaaaaa --- langs/ante.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/ante.yaml b/langs/ante.yaml index 539fd76..bd1be00 100644 --- a/langs/ante.yaml +++ b/langs/ante.yaml @@ -16,7 +16,7 @@ install: cargo install llvmenv llvmenv init # If compiler is not explicitly set to LLVM, then we get an - # error: unrecognized command-line option ‘-Wnewline-eof’. + # error: unrecognized command-line option '-Wnewline-eof'. CC=/usr/bin/clang CXX=/usr/bin/clang++ llvmenv build-entry -G Makefile -j$(nproc) 10.0.1 llvmenv global 10.0.1 manual: | From 0eddf34215dac6e3069ab1e3b53fdc40e332c1a7 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 11 Dec 2021 12:13:22 -0800 Subject: [PATCH 3/5] Downgrade --- packer/web.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/web.pkr.hcl b/packer/web.pkr.hcl index ff1125f..c20557a 100644 --- a/packer/web.pkr.hcl +++ b/packer/web.pkr.hcl @@ -35,7 +35,7 @@ variable "supervisor_access_token" { data "amazon-ami" "ubuntu" { filters = { - name = "ubuntu/images/hvm-ssd/ubuntu-*-21.10-amd64-server-*" + name = "ubuntu/images/hvm-ssd/ubuntu-*-21.04-amd64-server-*" root-device-type = "ebs" virtualization-type = "hvm" } From 61890838cda00d28347ed0c55d71c0f60c8ae494 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 11 Dec 2021 12:27:31 -0800 Subject: [PATCH 4/5] Carp has become too slow to run --- langs/carp.yaml | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 langs/carp.yaml diff --git a/langs/carp.yaml b/langs/carp.yaml deleted file mode 100644 index 4aca952..0000000 --- a/langs/carp.yaml +++ /dev/null @@ -1,49 +0,0 @@ -id: "carp" -name: "Carp" - -info: - year: 2015 - desc: "Programming language designed to work well for interactive and performance sensitive use cases like games, sound synthesis and visualizations" - ext: carp - web: - source: "https://github.com/carp-lang/Carp" - category: general - mode: interpreted - platform: [] - syntax: lisp - typing: static - paradigm: - - functional - - imperative - usage: [] - -install: - manual: | - install -d "${pkg}/opt/carp" - install -d "${pkg}/usr/local/bin" - - ver="$(curl -sSL "https://api.github.com/repos/carp-lang/Carp/releases" | jq '.[].tag_name' -r | grep Linux | sort -rV | grep -Eo '[0-9.]+' | head -n1)" - wget "https://github.com/carp-lang/Carp/releases/download/v${ver}_Linux/v${ver}.zip" -O carp.zip - unzip carp.zip - mv "v${ver}/bin"/* "${pkg}/usr/local/bin/" - mv "v${ver}/core" "${pkg}/opt/carp/" - -repl: | - CARP_DIR=/opt/carp carp -input: | - (* 123 234) - -main: "main.carp" -template: | - (use IO) - - (println "Hello, world!") - -run: | - CARP_DIR=/opt/carp carp main.carp - -scope: - code: | - (def x (* 123 234)) - -timeoutFactor: 8 From 0b7c77ebae6db7aa618b9577f543f3437b887126 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 11 Dec 2021 13:55:20 -0800 Subject: [PATCH 5/5] Lose more sanity --- docker/app/install-build.bash | 2 +- langs/kotlin.yaml | 2 ++ langs/purescript.yaml | 2 +- langs/python.yaml | 3 +++ langs/qsharp.yaml | 2 ++ langs/red.yaml | 2 +- langs/scala.yaml | 5 +++++ langs/unison.yaml | 4 ++-- 8 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docker/app/install-build.bash b/docker/app/install-build.bash index 5b80794..42281fc 100755 --- a/docker/app/install-build.bash +++ b/docker/app/install-build.bash @@ -15,7 +15,7 @@ curl -sSL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - ubuntu_ver="$(lsb_release -rs)" ubuntu_name="$(lsb_release -cs)" -node_repo="$(curl -sS https://deb.nodesource.com/setup_current.x | grep NODEREPO= | grep -Eo 'node_[0-9]+\.x' | head -n1)" +node_repo="$(curl -sS https://deb.nodesource.com/setup_16.x | grep NODEREPO= | grep -Eo 'node_[0-9]+\.x' | head -n1)" tee -a /etc/apt/sources.list.d/custom.list >/dev/null < .purs-repl; spago repl; else echo 'import Prelude' > .purs-repl; spago repl -d; fi -timeoutFactor: 2 +timeoutFactor: 8 diff --git a/langs/python.yaml b/langs/python.yaml index 6a63fc1..a024b06 100644 --- a/langs/python.yaml +++ b/langs/python.yaml @@ -90,3 +90,6 @@ lsp: InterpreterPath: /usr/bin/python3 code: "import func" item: "functools" + +skip: + - lsp diff --git a/langs/qsharp.yaml b/langs/qsharp.yaml index 98f7a42..19abf41 100644 --- a/langs/qsharp.yaml +++ b/langs/qsharp.yaml @@ -60,3 +60,5 @@ template: | run: | dotnet run --project main + +timeoutFactor: 4 diff --git a/langs/red.yaml b/langs/red.yaml index 8c69509..8bcf716 100644 --- a/langs/red.yaml +++ b/langs/red.yaml @@ -23,7 +23,7 @@ setup: | repl: | "$(which red)" input: | - DELAY: 1 + DELAY: 5 123 * 234 main: "main.red" diff --git a/langs/scala.yaml b/langs/scala.yaml index 08b7f1f..78575c9 100644 --- a/langs/scala.yaml +++ b/langs/scala.yaml @@ -7,6 +7,9 @@ install: repl: | scala +input: | + DELAY: 5 + 123 * 234 main: "main.scala" template: | @@ -18,3 +21,5 @@ run: | scope: code: | val x = 123 * 234 + +timeoutFactor: 2 diff --git a/langs/unison.yaml b/langs/unison.yaml index a48dd64..9e9d9b3 100644 --- a/langs/unison.yaml +++ b/langs/unison.yaml @@ -63,11 +63,11 @@ scope: code: | x = 123 * 234 input: | - DELAY: 5 + DELAY: 15 load main.u DELAY: 5 add x DELAY: 5 display x -timeoutFactor: 2 +timeoutFactor: 4