From 284f0397157a790ede1b8e298f65ca760eb517eb Mon Sep 17 00:00:00 2001
From: Martin Schoeberl <martin@jopdesign.com>
Date: Tue, 5 Nov 2024 15:11:13 -0800
Subject: [PATCH] Fix Ubuntu version and sbt

---
 .github/workflows/docs.yaml | 11 ++++++-----
 .github/workflows/gds.yaml  | 24 +++++++++++++-----------
 .github/workflows/test.yaml | 11 ++++++-----
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 23f9ff35..ed2e8f26 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -6,18 +6,19 @@ on:
 
 jobs:
   docs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Set up JDK 11
+      - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'sbt'
+          distribution: temurin
+          java-version: 17
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - name: generate Verilog
         run: sbt run
 
diff --git a/.github/workflows/gds.yaml b/.github/workflows/gds.yaml
index 758faf35..c7edf00a 100644
--- a/.github/workflows/gds.yaml
+++ b/.github/workflows/gds.yaml
@@ -6,18 +6,19 @@ on:
 
 jobs:
   gds:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout repo
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Set up JDK 11
+      - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'sbt'
+          distribution: temurin
+          java-version: 17
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - name: generate Verilog
         run: sbt run
       - name: Build GDS
@@ -34,18 +35,19 @@ jobs:
 
   gl_test:
     needs: gds
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout repo
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Set up JDK 11
+      - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'sbt'
+          distribution: temurin
+          java-version: 17
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - name: generate Verilog
         run: sbt run
       - name: GL test
@@ -53,7 +55,7 @@ jobs:
 
   viewer:
     needs: gds
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       pages: write      # to deploy to Pages
       id-token: write   # to verify the deployment originates from an appropriate source
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 384ea017..d76c2c2b 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -2,7 +2,7 @@ name: test
 on: [push, workflow_dispatch]
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -23,12 +23,13 @@ jobs:
         shell: bash
         run: pip install -r test/requirements.txt
 
-      - name: Set up JDK 11
+      - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'sbt'
+          distribution: temurin
+          java-version: 17
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - name: generate Verilog
         run: sbt run