From b0210f8f4c654d051a32b37a6f38d4cc7d5fca95 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 6 Nov 2021 13:41:17 -0700 Subject: [PATCH 01/18] Migrate to advanced Fathom Analytics Allow interpolating an arbitrary analytics tag. --- Makefile | 2 +- backend/server.js | 6 +++--- doc/selfhosting.md | 6 +++--- frontend/pages/app.ejs | 4 ++-- frontend/pages/index.ejs | 4 ++-- packer/provision-web.bash | 2 +- packer/riju.service | 2 +- packer/web.pkr.hcl | 6 +++--- supervisor/src/main.go | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index aad9d3e..819a0b4 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ else SHELL_PORTS := endif -SHELL_ENV := -e Z -e CI -e TEST_PATIENCE -e TEST_CONCURRENCY -e TEST_TIMEOUT_SECS -e FATHOM_SITE_ID +SHELL_ENV := -e Z -e CI -e TEST_PATIENCE -e TEST_CONCURRENCY -e TEST_TIMEOUT_SECS -e ANALYTICS_TAG ifeq ($(I),lang) LANG_TAG := lang-$(L) diff --git a/backend/server.js b/backend/server.js index 3045370..63305c3 100644 --- a/backend/server.js +++ b/backend/server.js @@ -15,7 +15,7 @@ const host = process.env.HOST || "localhost"; const port = parseInt(process.env.PORT || "") || 6119; const tlsPort = parseInt(process.env.TLS_PORT || "") || 6120; const useTLS = process.env.TLS ? true : false; -const fathomSiteId = process.env.FATHOM_SITE_ID || ""; +const analyticsTag = process.env.ANALYTICS_TAG || ""; const langs = await langsPromise; const app = express(); @@ -27,7 +27,7 @@ app.get("/", (_, res) => { if (Object.keys(langs).length > 0) { res.render(path.resolve("frontend/pages/index"), { langs, - fathomSiteId, + analyticsTag, }); } else { res @@ -61,7 +61,7 @@ app.get("/:lang", (req, res) => { } res.render(path.resolve("frontend/pages/app"), { config: langs[lang], - fathomSiteId, + analyticsTag, }); }); app.use("/css", express.static("frontend/styles")); diff --git a/doc/selfhosting.md b/doc/selfhosting.md index 60f62f2..35ef4ab 100644 --- a/doc/selfhosting.md +++ b/doc/selfhosting.md @@ -263,9 +263,9 @@ enable all the fun CloudFlare options you'd like. ## Set up analytics (optional) -Sign up for Fathom Analytics, enter your domain name, and get a site -ID. Set this as `FATHOM_SITE_ID` in your `.env` file, and build and -roll out a new web AMI. +Sign up for Fathom Analytics, enter your domain name, and get a tag +for embedding. Set this as `ANALYTICS_TAG` in your `.env` file (don't +forget the appropriate quoting), and build and roll out a new web AMI. ## Set up monitoring (optional) diff --git a/frontend/pages/app.ejs b/frontend/pages/app.ejs index b2db5a3..495d279 100644 --- a/frontend/pages/app.ejs +++ b/frontend/pages/app.ejs @@ -22,8 +22,8 @@ window.rijuConfig = <%- JSON.stringify(config) %>; - <% if (fathomSiteId) { %> - + <% if (analyticsTag) { %> + <%= analyticsTag %> <% } %> diff --git a/frontend/pages/index.ejs b/frontend/pages/index.ejs index 77c1830..fe25f16 100644 --- a/frontend/pages/index.ejs +++ b/frontend/pages/index.ejs @@ -30,8 +30,8 @@ <% } else { %> Riju is loading language configuration... <% } %> - <% if (fathomSiteId) { %> - + <% if (analyticsTag) { %> + <%= analyticsTag %> <% } %> diff --git a/packer/provision-web.bash b/packer/provision-web.bash index 62a4bb1..dac1f74 100644 --- a/packer/provision-web.bash +++ b/packer/provision-web.bash @@ -59,7 +59,7 @@ sudo sed -Ei 's|^#?PermitRootLogin .*|PermitRootLogin no|' /etc/ssh/sshd_config sudo sed -Ei 's|^#?PasswordAuthentication .*|PasswordAuthentication no|' /etc/ssh/sshd_config sudo sed -Ei 's|^#?PermitEmptyPasswords .*|PermitEmptyPasswords no|' /etc/ssh/sshd_config sudo sed -Ei "s|\\\$AWS_REGION|${AWS_REGION}|" /etc/systemd/system/riju.service -sudo sed -Ei "s|\\\$FATHOM_SITE_ID|${FATHOM_SITE_ID:-}|" /etc/systemd/system/riju.service +sudo sed -Ei "s|\\\$ANALYTICS_TAG|${ANALYTICS_TAG:-}|" /etc/systemd/system/riju.service sudo sed -Ei "s|\\\$S3_BUCKET|${S3_BUCKET}|" /etc/systemd/system/riju.service sudo sed -Ei "s|\\\$SENTRY_DSN|${SENTRY_DSN:-}|" /etc/systemd/system/riju.service sudo sed -Ei "s|\\\$SUPERVISOR_ACCESS_TOKEN|${SUPERVISOR_ACCESS_TOKEN}|" /etc/systemd/system/riju.service diff --git a/packer/riju.service b/packer/riju.service index 2697900..6e11ccf 100644 --- a/packer/riju.service +++ b/packer/riju.service @@ -11,7 +11,7 @@ ExecStart=riju-supervisor Restart=always RestartSec=5 Environment=AWS_REGION=$AWS_REGION -Environment=FATHOM_SITE_ID=$FATHOM_SITE_ID +Environment=ANALYTICS_TAG=ANALYTICS_TAG Environment=S3_BUCKET=$S3_BUCKET Environment=SENTRY_DSN=$SENTRY_DSN Environment=SUPERVISOR_ACCESS_TOKEN=$SUPERVISOR_ACCESS_TOKEN diff --git a/packer/web.pkr.hcl b/packer/web.pkr.hcl index 4ed4b3f..c20557a 100644 --- a/packer/web.pkr.hcl +++ b/packer/web.pkr.hcl @@ -8,9 +8,9 @@ variable "aws_region" { default = "${env("AWS_REGION")}" } -variable "fathom_site_id" { +variable "analytics_tag" { type = string - default = "${env("FATHOM_SITE_ID")}" + default = "${env("ANALYTICS_TAG")}" } variable "grafana_api_key" { @@ -116,7 +116,7 @@ build { environment_vars = [ "ADMIN_PASSWORD=${var.admin_password}", "AWS_REGION=${var.aws_region}", - "FATHOM_SITE_ID=${var.fathom_site_id}", + "ANALYTICS_TAG=${var.analytics_tag}", "GRAFANA_API_KEY=${var.grafana_api_key}", "S3_BUCKET=${var.s3_bucket}", "SENTRY_DSN=${var.sentry_dsn}", diff --git a/supervisor/src/main.go b/supervisor/src/main.go index 54c829b..2600475 100644 --- a/supervisor/src/main.go +++ b/supervisor/src/main.go @@ -355,7 +355,7 @@ func (sv *supervisor) reload() error { "-v", "/var/cache/riju:/var/cache/riju", "-v", "/var/run/docker.sock:/var/run/docker.sock", "-p", fmt.Sprintf("127.0.0.1:%d:6119", port), - "-e", "FATHOM_SITE_ID", + "-e", "ANALYTICS_TAG", "-e", "RIJU_DEPLOY_CONFIG", "-e", "SENTRY_DSN", "--label", fmt.Sprintf("riju.deploy-config-hash=%s", deployCfgHash), From 416a29ea2082ec62959ce27d60031ce941926e42 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 6 Nov 2021 14:04:02 -0700 Subject: [PATCH 02/18] Add financial info for October 2021 --- financials/2021-10/breakdown.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 financials/2021-10/breakdown.txt diff --git a/financials/2021-10/breakdown.txt b/financials/2021-10/breakdown.txt new file mode 100644 index 0000000..e7b0510 --- /dev/null +++ b/financials/2021-10/breakdown.txt @@ -0,0 +1,18 @@ +Riju :: $106.77 + EC2 :: $81.38 + Data Transfer :: $0.03 + EBS Snapshot :: $2.36 + EBS Volume :: $28.57 + EBS Volume :: $28.57 + gp2 :: $1.07 + gp3 :: $27.49 + Instance :: $50.43 + t3.large :: $23.05 + t3.medium :: $27.38 + ECR :: $5.14 + Storage :: $5.14 + ELB :: $20.14 + Data Transfer :: $0.38 + LCUs :: $0.07 + Load Balancer :: $19.68 + S3 :: $0.11 From dde8f9eba3bc5bd6eae75e78dcbe4347bc2ce7fa Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 6 Nov 2021 14:28:18 -0700 Subject: [PATCH 03/18] Upgrade server to Ubuntu 21.10 --- 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 c20557a..ff1125f 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.04-amd64-server-*" + name = "ubuntu/images/hvm-ssd/ubuntu-*-21.10-amd64-server-*" root-device-type = "ebs" virtualization-type = "hvm" } From 1b529af997c8df4e73c8c607c89ed4599f20a149 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sun, 7 Nov 2021 09:32:05 -0800 Subject: [PATCH 04/18] Fix typo --- packer/riju.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/riju.service b/packer/riju.service index 6e11ccf..c11177b 100644 --- a/packer/riju.service +++ b/packer/riju.service @@ -11,7 +11,7 @@ ExecStart=riju-supervisor Restart=always RestartSec=5 Environment=AWS_REGION=$AWS_REGION -Environment=ANALYTICS_TAG=ANALYTICS_TAG +Environment=ANALYTICS_TAG=$ANALYTICS_TAG Environment=S3_BUCKET=$S3_BUCKET Environment=SENTRY_DSN=$SENTRY_DSN Environment=SUPERVISOR_ACCESS_TOKEN=$SUPERVISOR_ACCESS_TOKEN From 18bfc4b0c58e1a5ae538b9ccb4c325dece359342 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sun, 7 Nov 2021 09:40:29 -0800 Subject: [PATCH 05/18] [#138] Add line numbers to C# stack traces --- langs/csharp.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/langs/csharp.yaml b/langs/csharp.yaml index e81e811..3988f44 100644 --- a/langs/csharp.yaml +++ b/langs/csharp.yaml @@ -19,9 +19,9 @@ template: | } compile: | - mcs main.cs + mcs -debug main.cs run: | - mono main.exe + mono --debug main.exe format: run: | From b2de59634297892baa6bd0c87ca16edc6037c002 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sun, 7 Nov 2021 10:29:34 -0800 Subject: [PATCH 06/18] Mess around more with analytics tag --- backend/server.js | 5 ++++- doc/selfhosting.md | 5 +++-- frontend/pages/app.ejs | 2 +- frontend/pages/index.ejs | 6 +++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/backend/server.js b/backend/server.js index 63305c3..457a679 100644 --- a/backend/server.js +++ b/backend/server.js @@ -15,7 +15,10 @@ const host = process.env.HOST || "localhost"; const port = parseInt(process.env.PORT || "") || 6119; const tlsPort = parseInt(process.env.TLS_PORT || "") || 6120; const useTLS = process.env.TLS ? true : false; -const analyticsTag = process.env.ANALYTICS_TAG || ""; +const analyticsTag = (process.env.ANALYTICS_TAG || "").replace( + /^'(.+)'$/, + "$1" +); const langs = await langsPromise; const app = express(); diff --git a/doc/selfhosting.md b/doc/selfhosting.md index 35ef4ab..43bb580 100644 --- a/doc/selfhosting.md +++ b/doc/selfhosting.md @@ -264,8 +264,9 @@ enable all the fun CloudFlare options you'd like. ## Set up analytics (optional) Sign up for Fathom Analytics, enter your domain name, and get a tag -for embedding. Set this as `ANALYTICS_TAG` in your `.env` file (don't -forget the appropriate quoting), and build and roll out a new web AMI. +for embedding. Set this as `ANALYTICS_TAG` in your `.env` file (use +single quoting, as Makefile handling of quotes is a bit nonstandard), +and build and roll out a new web AMI. ## Set up monitoring (optional) diff --git a/frontend/pages/app.ejs b/frontend/pages/app.ejs index 495d279..4b56337 100644 --- a/frontend/pages/app.ejs +++ b/frontend/pages/app.ejs @@ -23,7 +23,7 @@ <% if (analyticsTag) { %> - <%= analyticsTag %> + <%- analyticsTag %> <% } %> diff --git a/frontend/pages/index.ejs b/frontend/pages/index.ejs index fe25f16..ac45a26 100644 --- a/frontend/pages/index.ejs +++ b/frontend/pages/index.ejs @@ -4,6 +4,9 @@ Riju + <% if (analyticsTag) { %> + <%- analyticsTag %> + <% } %>

Riju: fast online playground for every programming language

@@ -30,8 +33,5 @@ <% } else { %> Riju is loading language configuration... <% } %> - <% if (analyticsTag) { %> - <%= analyticsTag %> - <% } %> From fd399a2ad6200706da895be2e3e78f50301a98a2 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Mon, 15 Nov 2021 17:38:08 -0800 Subject: [PATCH 07/18] Temporarily pin to Ubuntu 21.04 Upgrading is hard and the build system makes it super hard to upgrade languages incrementally right now. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 819a0b4..c2d94d7 100644 --- a/Makefile +++ b/Makefile @@ -52,8 +52,8 @@ ifeq ($(I),lang) @: $${L} node tools/build-lang-image.js --lang $(L) else ifeq ($(I),ubuntu) - docker pull ubuntu:rolling - hash="$$(docker inspect ubuntu:rolling -f '{{ .Id }}' | sha1sum | awk '{ print $$1 }')"; echo "FROM ubuntu:rolling" | docker build --label riju.image-hash="$${hash}" -t riju:$(I) - + docker pull ubuntu:21.04 + hash="$$(docker inspect ubuntu:21.04 -f '{{ .Id }}' | sha1sum | awk '{ print $$1 }')"; echo "FROM ubuntu:21.04" | docker build --label riju.image-hash="$${hash}" -t riju:$(I) - else ifneq (,$(filter $(I),admin ci)) docker build . -f docker/$(I)/Dockerfile -t riju:$(I) $(NO_CACHE) else From 858f612d384c8ac53682076af8dca485c603ce78 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Mon, 15 Nov 2021 17:45:25 -0800 Subject: [PATCH 08/18] Pin more --- docker/admin/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/admin/Dockerfile b/docker/admin/Dockerfile index ea76193..1981d6d 100644 --- a/docker/admin/Dockerfile +++ b/docker/admin/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:rolling +FROM ubuntu:21.04 COPY docker/admin/install.bash /tmp/ RUN /tmp/install.bash From 066c543e3035caf9356cfc0d9c35c40b70a1cee6 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Mon, 15 Nov 2021 18:22:48 -0800 Subject: [PATCH 09/18] Start trying to fix Ante --- langs/ante.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/langs/ante.yaml b/langs/ante.yaml index 2f34309..344e3e1 100644 --- a/langs/ante.yaml +++ b/langs/ante.yaml @@ -9,6 +9,7 @@ install: - cargo - cmake - libssl-dev + - libunwind-dev - pkg-config - python3-distutils manual: | @@ -17,8 +18,8 @@ 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) 12.0.1 + llvmenv global 12.0.1 manual: | git clone https://github.com/jfecher/ante.git pushd ante From cf47e68727682e2519b407268ea390e2dade9489 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Mon, 15 Nov 2021 18:22:56 -0800 Subject: [PATCH 10/18] [#139] Downgrade to Node 16.x LTS --- docker/admin/install.bash | 2 +- docker/runtime/install.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/admin/install.bash b/docker/admin/install.bash index 962ae65..d64abb5 100755 --- a/docker/admin/install.bash +++ b/docker/admin/install.bash @@ -19,7 +19,7 @@ curl -fsSL https://download.docker.com/linux/ubuntu/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 </dev/null < Date: Sun, 5 Dec 2021 17:59:01 -0800 Subject: [PATCH 11/18] Add financial data for Nov 2021 --- financials/2021-11/breakdown.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 financials/2021-11/breakdown.txt diff --git a/financials/2021-11/breakdown.txt b/financials/2021-11/breakdown.txt new file mode 100644 index 0000000..3462f7d --- /dev/null +++ b/financials/2021-11/breakdown.txt @@ -0,0 +1,17 @@ +Riju :: $133.50 + EC2 :: $108.22 + Data Transfer :: $0.02 + EBS Snapshot :: $3.79 + EBS Volume :: $27.58 + EBS Volume :: $27.58 + gp2 :: $1.04 + gp3 :: $26.55 + Instance :: $76.82 + t3.large :: $76.82 + ECR :: $5.34 + Storage :: $5.34 + ELB :: $19.83 + Data Transfer :: $0.69 + LCUs :: $0.10 + Load Balancer :: $19.04 + S3 :: $0.11 From 2dda21f0af28c153050e48f32884ed3faad8a48d Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 11 Dec 2021 11:16:46 -0800 Subject: [PATCH 12/18] Roll back to working version of Ante This reverts commit 066c543e3035caf9356cfc0d9c35c40b70a1cee6. --- docker/ci/Dockerfile | 2 +- langs/ante.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile index 8098cb4..e15397b 100644 --- a/docker/ci/Dockerfile +++ b/docker/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:rolling +FROM ubuntu:21.04 COPY docker/ci/install.bash /tmp/ RUN /tmp/install.bash diff --git a/langs/ante.yaml b/langs/ante.yaml index 344e3e1..e061695 100644 --- a/langs/ante.yaml +++ b/langs/ante.yaml @@ -9,7 +9,6 @@ install: - cargo - cmake - libssl-dev - - libunwind-dev - pkg-config - python3-distutils manual: | @@ -18,11 +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) 12.0.1 - llvmenv global 12.0.1 + CC=/usr/bin/clang CXX=/usr/bin/clang++ llvmenv build-entry -G Makefile -j$(nproc) 10.0.0 + llvmenv global 10.0.0 manual: | - git clone https://github.com/jfecher/ante.git + git clone https://github.com/jfecher/ante.git -n pushd ante + git checkout 6e61e9f7ed9300ed68f6b9459b69f027e09a0c42 LLVM_SYS_100_PREFIX="$(llvmenv prefix)" cargo build --release install -d "${pkg}/opt/ante" install -d "${pkg}/usr/local/bin" From 1d57528328bc173ec94019c66d54386d30f739ae Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 11 Dec 2021 11:48:58 -0800 Subject: [PATCH 13/18] 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 14/18] 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 15/18] 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 16/18] 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 17/18] 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 From 5a071b0aa6b97f10fa5bf706299fdd46793d73b6 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Wed, 22 Dec 2021 12:40:42 -0800 Subject: [PATCH 18/18] Install tree in admin shell --- docker/admin/install.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/admin/install.bash b/docker/admin/install.bash index d64abb5..9f9fb1f 100755 --- a/docker/admin/install.bash +++ b/docker/admin/install.bash @@ -57,8 +57,9 @@ skopeo ssh strace sudo -tmux terraform +tmux +tree unzip uuid-runtime vim