From 50ce5e533e862f7ba0760a4f5dc43ae2cb5455f0 Mon Sep 17 00:00:00 2001
From: Justin Florentine <justin+github@florentine.us>
Date: Fri, 17 Nov 2023 15:44:02 -0500
Subject: [PATCH] needs java 17

Signed-off-by: Justin Florentine <justin+github@florentine.us>
---
 .github/workflows/ci.yml      | 22 +++++++++++++++++++++-
 .github/workflows/javadoc.yml | 22 ----------------------
 2 files changed, 21 insertions(+), 23 deletions(-)
 delete mode 100644 .github/workflows/javadoc.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 982355b02b9..b3829a6c259 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: adopt
-          java-version: 11
+          java-version: 17
           cache: gradle
       - name: Compile
         uses: gradle/gradle-build-action@v2
@@ -41,6 +41,26 @@ jobs:
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
       - name: list perms
         run: ls -la
+  javadoc_17:
+    runs-on: [ self-hosted ]
+    needs: compile
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+      - name: Set up Java 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: adopt
+          java-version: 17
+          cache: gradle
+      - name: Restore classes
+        uses: actions/cache@v3
+        with:
+          path: "**/*.class"
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
+      - name: javadoc (JDK 17)
+        run: ./gradlew --no-daemon javadoc
   assemble:
     runs-on: [self-hosted, Linux, X64]
     needs: compile
diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
deleted file mode 100644
index 26181b3e79f..00000000000
--- a/.github/workflows/javadoc.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: "Javadoc linter"
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  javadoc_17:
-    runs-on: [ self-hosted ]
-    if: ${{ github.actor != 'dependabot[bot]' }}
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v3
-      - name: Set up Java 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: adopt
-          java-version: 17
-          cache: gradle
-      - name: javadoc (JDK 17)
-        run: ./gradlew --no-daemon clean javadoc