From ab95faead5dfbb152f7dfde1e6e8b1a3091178d5 Mon Sep 17 00:00:00 2001
From: showwin <showwin_kmc@yahoo.co.jp>
Date: Sun, 6 Oct 2024 15:36:19 +0900
Subject: [PATCH] End of support: Node.js

---
 .github/workflows/benchmark.yml             |  1 -
 .github/workflows/build_and_push_images.yml |  5 ++---
 Makefile                                    |  8 ++++----
 README.md                                   |  2 +-
 run.sh                                      | 20 --------------------
 5 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index a4d065c..d24303c 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -14,7 +14,6 @@ jobs:
       matrix:
         language:
           - "go"
-          # - "nodejs"
           - "python"
           - "ruby"
     env:
diff --git a/.github/workflows/build_and_push_images.yml b/.github/workflows/build_and_push_images.yml
index 106fd9b..8f5b2b3 100644
--- a/.github/workflows/build_and_push_images.yml
+++ b/.github/workflows/build_and_push_images.yml
@@ -67,10 +67,9 @@ jobs:
       fail-fast: false
       matrix:
         language:
-          # - "go"
-          # - "nodejs"
+          - "go"
           - "python"
-          # - "ruby"
+          - "ruby"
     env:
       ISHOCON_APP_LANG: ${{ matrix.language }}
       UNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
diff --git a/Makefile b/Makefile
index 385278c..d606f66 100644
--- a/Makefile
+++ b/Makefile
@@ -75,18 +75,18 @@ bench-with-db-init:
 	";
 
 check-lang:
-	if echo "$(ISHOCON_APP_LANG)" | grep -qE '^(ruby|python|go|nodejs)$$'; then \
+	if echo "$(ISHOCON_APP_LANG)" | grep -qE '^(ruby|python|go)$$'; then \
         echo "ISHOCON_APP_LANG is valid."; \
     else \
-        echo "Invalid ISHOCON_APP_LANG. It must be one of: ruby, python, go, nodejs."; \
+        echo "Invalid ISHOCON_APP_LANG. It must be one of: ruby, python, go."; \
         exit 1; \
     fi;
 
 change-lang: check-lang
 	if sed --version 2>&1 | grep -q GNU; then \
 		echo "GNU sed"; \
-		sed -i 's/\(ruby\|python\|go\|nodejs\)/'"$(ISHOCON_APP_LANG)"'/g' ./docker-compose.yml; \
+		sed -i 's/\(ruby\|python\|go\)/'"$(ISHOCON_APP_LANG)"'/g' ./docker-compose.yml; \
 	else \
 		echo "BSD sed"; \
-		sed -i '' -E 's/(ruby|python|go|nodejs)/'"$(ISHOCON_APP_LANG)"'/g' ./docker-compose.yml; \
+		sed -i '' -E 's/(ruby|python|go)/'"$(ISHOCON_APP_LANG)"'/g' ./docker-compose.yml; \
 	fi;
diff --git a/README.md b/README.md
index aea3359..6271009 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ ISUCONは3人チームで取り組むことを基準に課題が作られてい
 * AMI: `ami-0d00b2a9a38084503`
 * インスタンスタイプ: `c5.xlarge`
 * 参考実装言語: Ruby, Go, Python
-  * メンテナンス外: Crystal(by [@Goryudyuma](https://github.com/Goryudyuma)), Scala(by [@Goryudyuma](https://github.com/Goryudyuma))
+  * メンテナンス外: Node.js(TypeScript), Crystal(by [@Goryudyuma](https://github.com/Goryudyuma)), Scala(by [@Goryudyuma](https://github.com/Goryudyuma))
 * 推奨実施時間: 1人で8時間
 
 ## 社内ISUCON等のイベントで使用したい方
diff --git a/run.sh b/run.sh
index 3bdf2ef..8a6621f 100755
--- a/run.sh
+++ b/run.sh
@@ -56,25 +56,5 @@ function run_go() {
   /tmp/go/webapp
 }
 
-function run_php() {
-  cd "/home/ishocon/webapp/$app_lang"
-  sudo service php7.2-fpm restart
-  make_tmp_file
-  sudo tail -f /var/log/nginx/access.log /var/log/nginx/error.log
-}
-
-function run_nodejs() {
-  cd "/home/ishocon/webapp/$app_lang"
-  make_tmp_file
-  npm run start
-}
-
-function run_crystal() {
-  cd "/home/ishocon/webapp/$app_lang"
-  sudo shards install
-  make_tmp_file
-  sudo crystal app.cr
-}
-
 echo "starting running $app_lang app..."
 "run_${app_lang}"