Merge branch 'develop'

brianhsu · May 21, 2024 · a50bcde · a50bcde
2 parents 318f461 + e0f6c80
commit a50bcde
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -19,13 +19,14 @@ jobs:
       GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       EXCLUDE_TEST_TAG: moe.brianhsu.AudioOutputTest
     container:
-      image: openjdk:11
+      image: openjdk:17
     steps:
       - uses: actions/checkout@v3
       - name: Install packages
         run: |
-          apt-get update -yqq
-          apt-get install apt-transport-https -yqq
+          apt-get update -y
+          apt-get install apt-transport-https curl gnupg -y
+          apt-get install openjdk-17-jre openjdk-17-jdk-headless -y
           echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list
           echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.list.d/sbt_old.list
           curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add
@@ -41,7 +42,7 @@ jobs:
       - name: Test and Coverage
         run: |
           ./distclean
-          xvfb-run --auto-servernum sbt coverage test coverageAggregate
+          LANG=C.utf-8 xvfb-run --auto-servernum sbt coverage test coverageAggregate
 
       - name: Archive Test Results
         if: always()

diff --git a/.github/workflows/unitTest.yaml b/.github/workflows/unitTest.yaml
@@ -20,13 +20,14 @@ jobs:
       GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       EXCLUDE_TEST_TAG: moe.brianhsu.AudioOutputTest  
     container:
-      image: openjdk:11
+      image: ubuntu:22.04
     steps:
       - uses: actions/checkout@v3
       - name: Install packages
         run: |
-          apt-get update -yqq
-          apt-get install apt-transport-https -yqq
+          apt-get update -y
+          apt-get install apt-transport-https curl gnupg -y
+          apt-get install openjdk-17-jre openjdk-17-jdk-headless -y
           echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list
           echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.list.d/sbt_old.list
           curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add
@@ -35,7 +36,7 @@ jobs:
           apt-get -y install xorg-dev libglu1-mesa libgl1-mesa-dev xvfb libxinerama1 libxcursor1 libswt-gtk-4-java libswt-gtk-4-jni libxml2-utils bc
       - name: Unit test
         run: |
-          xvfb-run --auto-servernum sbt coverage test coverageAggregate
+          LANG=C.utf-8 xvfb-run --auto-servernum sbt coverage test coverageAggregate
 
       - name: Archive Test Results
         if: always()

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
 
 addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
 
 // project/plugins.sbt
-addSbtPlugin("ch.epfl.scala" % "sbt-scala3-migrate" % "0.6.1")
+addSbtPlugin("ch.epfl.scala" % "sbt-scala3-migrate" % "0.6.1")