chore: additional ci cleanup

Signed-off-by: Sam Gammon <[email protected]>
sgammon · Jan 7, 2024 · f67efc2 · f67efc2
1 parent b9291b4
commit f67efc2
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/.github/workflows/checks.codeql.yml b/.github/workflows/checks.codeql.yml
@@ -32,18 +32,13 @@ env:
 
 jobs:
   analyze:
-    name: Analyze
+    name: "CodeQL"
     runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ["java"]
-
     steps:
       - name: "Setup: Harden Runner"
         uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
@@ -71,10 +66,10 @@ jobs:
       - name: "Setup: Initialize CodeQL"
         uses: github/codeql-action/init@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
         with:
-          languages: ${{ matrix.language }}
+          languages: java
       - name: "CodeQL: Autobuild"
         uses: github/codeql-action/autobuild@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
       - name: "CodeQL: Analysis"
         uses: github/codeql-action/analyze@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
         with:
-          category: "/language:${{matrix.language}}"
+          category: "/language:java"
diff --git a/.github/workflows/checks.dependency-review.yml b/.github/workflows/checks.dependency-review.yml
@@ -18,6 +18,7 @@ permissions:
 
 jobs:
   dependency-review:
+    name: "Dependency Review"
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner

diff --git a/.github/workflows/gradle.earthly.yml b/.github/workflows/gradle.earthly.yml
@@ -35,10 +35,9 @@ name: "Gradle (Earthly)"
         default: true
         type: boolean
         description: "Cache push"
-
     secrets:
       BUILDLESS_APIKEY:
-        required: false
+        required: true
         description: "API key for build caching"
 
   workflow_dispatch:
@@ -79,7 +78,7 @@ env:
 
 jobs:
   build:
-    name: Build and Test (Java ${{ inputs.java }})
+    name: Build/Test (Earthly, Java ${{ inputs.java }})
     runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
     steps:
       - name: "Setup: Harden Runner"

diff --git a/.github/workflows/maven.earthly.yml b/.github/workflows/maven.earthly.yml
@@ -35,10 +35,9 @@ name: "Maven (Earthly)"
         default: true
         type: boolean
         description: "Cache push"
-
     secrets:
       BUILDLESS_APIKEY:
-        required: false
+        required: true
         description: "API key for build caching"
 
   workflow_dispatch:
@@ -79,7 +78,7 @@ env:
 
 jobs:
   build:
-    name: Build and Test (Java ${{ inputs.java }})
+    name: Build/Test (Earthly, Java ${{ inputs.java }})
     runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
     steps:
       - name: "Setup: Harden Runner"

diff --git a/.github/workflows/on.pr.yml b/.github/workflows/on.pr.yml
@@ -16,7 +16,7 @@ jobs:
 
   ## Gradle: Earthly
   build-earthly-gradle:
-    name: "Build (Gradle)"
+    name: "Gradle (Earthly, Java ${{ matrix.java }})"
     uses: ./.github/workflows/gradle.earthly.yml
     secrets: inherit
     strategy:
@@ -32,7 +32,7 @@ jobs:
 
   ## Gradle: Earthly
   build-earthly-maven:
-    name: "Build (Maven)"
+    name: "Maven (Earthly, Java ${{ matrix.java }})"
     uses: ./.github/workflows/maven.earthly.yml
     secrets: inherit
     strategy:

diff --git a/.github/workflows/on.push.yml b/.github/workflows/on.push.yml
@@ -19,23 +19,30 @@ jobs:
 
   ## Gradle: Earthly
   build-earthly-gradle:
-    name: "Build (Earthly)"
+    name: "Gradle (Earthly, Java ${{ matrix.java }})"
     uses: ./.github/workflows/gradle.earthly.yml
+    secrets: inherit
     strategy:
       matrix:
         java: [17, 21]
-    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
     with:
       runner: ubuntu-latest
       java: ${{ matrix.java }}
 
   ## Gradle: Earthly
   build-earthly-maven:
+    name: "Maven (Earthly, Java ${{ matrix.java }})"
     uses: ./.github/workflows/maven.earthly.yml
+    secrets: inherit
     strategy:
       matrix:
         java: [17, 21]
-    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
     with:
       runner: ubuntu-latest
       java: ${{ matrix.java }}