From 1aeb5dc0e2276ae61546dab41c632981113d5c7a Mon Sep 17 00:00:00 2001 From: Fred Bricon Date: Sun, 26 Sep 2021 12:43:52 +0200 Subject: [PATCH 1/7] Remove unnecessary jdt.ls config --- langs/java.yaml | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/langs/java.yaml b/langs/java.yaml index 28d434f..33cc2e7 100644 --- a/langs/java.yaml +++ b/langs/java.yaml @@ -45,29 +45,6 @@ lsp: start: | java -Declipse.application=org.eclipse.jdt.ls.core.id1 -Dosgi.bundles.defaultStartLevel=4 -Declipse.product=org.eclipse.jdt.ls.core.product -Dlog.level=ALL -noverify -Xmx1G -jar /opt/jdt/plugins/org.eclipse.equinox.launcher_*.jar -configuration "$PWD/jdt" -data "$PWD" --add-modules=ALL-SYSTEM --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED init: - bundles: - - /opt/jdt/bundles/com.microsoft.java.test.plugin-0.19.0.jar - - /opt/jdt/bundles/com.microsoft.jdtls.ext.core-0.5.1.jar - - /opt/jdt/bundles/dg.jdt.ls.decompiler.cfr-0.0.2-201802221740.jar - - /opt/jdt/bundles/dg.jdt.ls.decompiler.common-0.0.2-201802221740.jar - - /opt/jdt/bundles/dg.jdt.ls.decompiler.fernflower-0.0.2-201802221740.jar - - /opt/jdt/bundles/dg.jdt.ls.decompiler.procyon-0.0.2-201802221740.jar - - /opt/jdt/bundles/io.projectreactor.reactor-core.jar - - /opt/jdt/bundles/java.debug.plugin.jar - - /opt/jdt/bundles/jdt-ls-commons.jar - - /opt/jdt/bundles/jdt-ls-extension.jar - - /opt/jdt/bundles/org.reactivestreams.reactive-streams.jar - extendedClientCapabilities: - advancedExtractRefactoringSupport: true - advancedGenerateAccessorsSupport: true - advancedOrganizeImportsSupport: true - classFileContentsSupport: true - generateConstructorsPromptSupport: true - generateToStringPromptSupport: true - hashCodeEqualsPromptSupport: true - moveRefactoringSupport: true - overrideMethodsPromptSupport: true - progressReportProvider: true settings: java: autobuild: @@ -131,16 +108,16 @@ lsp: - '**/archetype-resources/**' - '**/META-INF/maven/**' gradle: - enabled: true + enabled: false wrapper: - enabled: true + enabled: false maven: - enabled: true + enabled: false maven: downloadSources: false maxConcurrentBuilds: 1 progressReports: - enabled: true + enabled: false referencesCodeLens: enabled: false saveActions: From 1710193e0c389f37feeb9f0b7122f9b86a6bcbb0 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sun, 26 Sep 2021 11:13:51 -0700 Subject: [PATCH 2/7] [#116] Fix Ruby requiring trailing newline --- backend/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/api.js b/backend/api.js index da18dee..9b63574 100644 --- a/backend/api.js +++ b/backend/api.js @@ -309,7 +309,7 @@ export class Session { code = createEmpty !== undefined ? createEmpty : template + "\n"; } if (code && suffix) { - code += suffix + "\n"; + code += "\n" + suffix + "\n"; } await this.writeCode(code); const termArgs = this.privilegedPty(cmdline); From 3954ecfa2e51e7aa593418519c2b860e729c71a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Sep 2021 18:16:04 +0000 Subject: [PATCH 3/7] Bump ansi-regex from 5.0.0 to 5.0.1 Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/chalk/ansi-regex/releases) - [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: ansi-regex dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 50aa20f..39039a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1164,9 +1164,9 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^3.2.1: version "3.2.1" From 85afa783e5532206f66df5120ad0bac6e47eec70 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sun, 26 Sep 2021 11:25:11 -0700 Subject: [PATCH 4/7] Definitely do not deploy pull requests lol --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c34628..a30b7ff 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,9 +3,6 @@ on: push: branches: - master - pull_request: - branches: - - master concurrency: deploy jobs: deploy: From 1c8b0e14529d8b37eead3fd939612b9d518f1985 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 2 Oct 2021 16:46:08 -0700 Subject: [PATCH 5/7] Add cost breakdown for Oct 2021 --- financials/2021-09/breakdown.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 financials/2021-09/breakdown.txt diff --git a/financials/2021-09/breakdown.txt b/financials/2021-09/breakdown.txt new file mode 100644 index 0000000..a767444 --- /dev/null +++ b/financials/2021-09/breakdown.txt @@ -0,0 +1,27 @@ +Riju :: $81.55 + EC2 :: $57.02 + Data Transfer :: $0.02 + EBS Snapshot :: $1.97 + EBS Volume :: $26.82 + EBS Volume :: $26.82 + gp2 :: $1.01 + gp3 :: $25.81 + Instance :: $28.21 + t3.medium :: $19.01 + t3.small :: $9.21 + ECR :: $5.09 + Storage :: $5.09 + ELB :: $19.32 + Data Transfer :: $0.22 + LCUs :: $0.06 + Load Balancer :: $19.04 + S3 :: $0.12 + +COMMENTARY: We're starting to look pretty stable from month to month. +Naturally the costs are higher because we were operating the +infrastructure for the entire month this time, instead of being down +for half of it, but I think this cost is about what we should expect +to see going forward until changes are made. + +I did realize, by the way, that we can't use Lambda to replace the +ELB, because that wouldn't support websockets. Oh well. From bed2246fd3e0f24ce5107b7d09927dbcbc0345ec Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sun, 3 Oct 2021 11:39:45 -0700 Subject: [PATCH 6/7] Handle unhandled message --- frontend/src/app.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/app.js b/frontend/src/app.js index 7c77bac..fdd2549 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -334,6 +334,11 @@ async function main() { break; } return; + case "langConfig": + // We could use this message instead of hardcoding the + // language config into the HTML page returned from the + // server, but for now we just ignore it. + return; default: console.error("Unexpected message from server:", message); return; From efaaf73012eafdcce4b6a22dde5113c3ecf1a26d Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sun, 3 Oct 2021 11:40:07 -0700 Subject: [PATCH 7/7] [#121] Use separate data dir for JDT --- langs/java.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/langs/java.yaml b/langs/java.yaml index 33cc2e7..74132d7 100644 --- a/langs/java.yaml +++ b/langs/java.yaml @@ -14,7 +14,7 @@ install: wget https://download.eclipse.org/jdtls/snapshots/jdt-language-server-latest.tar.gz tar -xf jdt-language-server-latest.tar.gz -C "${pkg}/opt/jdt" -main: "Main.java" +main: "src/Main.java" template: | public class Main { public static void main(String[] args) { @@ -23,9 +23,9 @@ template: | } compile: | - javac Main.java + javac src/Main.java run: | - java Main + java -cp src Main format: run: | @@ -41,9 +41,9 @@ format: lsp: setup: | - rm -rf jdt && cp -RT /opt/jdt/config_linux jdt + rm -rf "$HOME/jdt-config" && cp -RT /opt/jdt/config_linux "$HOME/jdt-config" start: | - java -Declipse.application=org.eclipse.jdt.ls.core.id1 -Dosgi.bundles.defaultStartLevel=4 -Declipse.product=org.eclipse.jdt.ls.core.product -Dlog.level=ALL -noverify -Xmx1G -jar /opt/jdt/plugins/org.eclipse.equinox.launcher_*.jar -configuration "$PWD/jdt" -data "$PWD" --add-modules=ALL-SYSTEM --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED + java -Declipse.application=org.eclipse.jdt.ls.core.id1 -Dosgi.bundles.defaultStartLevel=4 -Declipse.product=org.eclipse.jdt.ls.core.product -Dlog.level=ALL -noverify -Xmx1G -jar /opt/jdt/plugins/org.eclipse.equinox.launcher_*.jar -configuration "$HOME/jdt-config" -data "$HOME/jdt-data" --add-modules=ALL-SYSTEM --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED init: settings: java: