From b2afa2114f488fd18b6c7f9bbc1f3798218debe3 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 24 Aug 2025 00:11:43 -0400
Subject: [PATCH] ci: Split server-test

---
 .github/workflows/ci.yml          | 19 +------------------
 .github/workflows/server-test.yml | 29 +++++++++++++++++++++++++++++
 launcher-package/LICENSE          |  2 +-
 3 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 .github/workflows/server-test.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a0afd1cb..122d84620 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,19 +85,13 @@ jobs:
       with:
         distribution: "${{ matrix.distribution }}"
         java-version: "${{ matrix.java }}"
+        cache: "sbt"
     - name: Setup SBT
       uses: sbt/setup-sbt@v1
     - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
         python-version: 3.12
-    - name: Coursier cache
-      uses: coursier/cache-action@v6
-    # - name: Cache sbt
-    #   uses: actions/cache@v4
-    #   with:
-    #     path: ~/.sbt
-    #     key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
     - name: Setup Windows C++ toolchain
       uses: ilammy/msvc-dev-cmd@v1
       if: ${{ matrix.os == 'windows-latest' }}
@@ -116,7 +110,6 @@ jobs:
         ./sbt -v --client "Test/compile"
         ./sbt -v --client publishLocal
         ./sbt -v --client test
-        ./sbt -v --client "serverTestProj/test"
         ./sbt -v --client doc
         ./sbt -v --client "all $UTIL_TESTS"
         ./sbt -v --client ++2.13.x
@@ -200,13 +193,3 @@ jobs:
         cd citest
         ./test.bat
         test3/test3.bat
-    - name: Cleanup
-      shell: bash
-      run: |
-        rm -rf "$HOME/.sbt/scripted/" || true
-        rm -rf "$HOME/.ivy2/local" || true
-        rm -r $(find $HOME/.sbt/boot -name "*-SNAPSHOT") || true
-        find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
-        find $HOME/.ivy2/cache                       -name "ivydata-*.properties" -delete || true
-        find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
-        find $HOME/.sbt                              -name "*.lock"               -delete || true
diff --git a/.github/workflows/server-test.yml b/.github/workflows/server-test.yml
new file mode 100644
index 000000000..eef06bb82
--- /dev/null
+++ b/.github/workflows/server-test.yml
@@ -0,0 +1,29 @@
+name: Server Test
+on:
+  pull_request:
+  push:
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      JAVA_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
+      JVM_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
+      SBT_ETC_FILE: $HOME/etc/sbt/sbtopts
+    steps:
+    - name: Checkout sbt/sbt
+      uses: actions/checkout@v4
+    - name: Setup JDK
+      uses: actions/setup-java@v5
+      with:
+        distribution: "zulu"
+        java-version: "8"
+        cache: sbt
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
+    - name: Server test
+      shell: bash
+      run: sbt -v --client "serverTestProj/test"
diff --git a/launcher-package/LICENSE b/launcher-package/LICENSE
index 7a694c969..ea5b60640 120000
--- a/launcher-package/LICENSE
+++ b/launcher-package/LICENSE
@@ -1 +1 @@
-LICENSE
\ No newline at end of file
+../LICENSE
\ No newline at end of file