From 92afbcea2c73411764fec7dc9017ab98d52a27a0 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Sat, 13 Aug 2022 16:55:35 -0700
Subject: [PATCH] clean up matrix

---
 .github/workflows/test-and-snapshot.yml | 29 -----------------------
 .github/workflows/test.yml              | 31 +------------------------
 2 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/.github/workflows/test-and-snapshot.yml b/.github/workflows/test-and-snapshot.yml
index 15cdb58..51be417 100644
--- a/.github/workflows/test-and-snapshot.yml
+++ b/.github/workflows/test-and-snapshot.yml
@@ -74,35 +74,6 @@ jobs:
       - name: Run Tests
         run: clojure -T:build test
 
-  build-graalvm-old:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        graalvm: [ '19.3.6', '20.3.2' ]
-        base: [ 'java8', 'java11' ]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@5.0
-        with:
-          graalvm: ${{ matrix.graalvm }}
-          java: ${{ matrix.base }}
-      - name: Setup Clojure
-        uses: DeLaGuardo/setup-clojure@master
-        with:
-          tools-deps: '1.10.3.1053'
-      - name: Cache All The Things
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gitlibs
-            ~/.clojure
-            ~/.cpcache
-          key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
-      - name: Run Tests
-        run: clojure -T:build test
-
   build-graalvm-new:
     runs-on: ubuntu-latest
     strategy:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ca1ecd3..1622ff0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11', '14', '15', '16', '17' ]
+        java: [ '8', '11', '14', '17', '18' ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
@@ -40,35 +40,6 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: testing
 
-  build-graalvm-old:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        graalvm: [ '19.3.6', '20.3.2' ]
-        base: [ 'java8', 'java11' ]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@5.0
-        with:
-          graalvm: ${{ matrix.graalvm }}
-          java: ${{ matrix.base }}
-      - name: Setup Clojure
-        uses: DeLaGuardo/setup-clojure@master
-        with:
-          tools-deps: '1.10.3.1053'
-      - name: Cache All The Things
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gitlibs
-            ~/.clojure
-            ~/.cpcache
-          key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
-      - name: Run Tests
-        run: clojure -T:build test
-
   build-graalvm-new:
     runs-on: ubuntu-latest
     strategy: