From 1133c842ab614205b3f6a8b8f6abf364f68f46e9 Mon Sep 17 00:00:00 2001
From: Brian Norman <brian@bnorm.com>
Date: Sun, 11 Sep 2022 12:40:20 -0500
Subject: [PATCH] Combine build and validation

---
 .github/workflows/build.yml | 56 +++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8a5958389d6..71ec8373357 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,13 +11,36 @@ env:
   GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dkotlin.incremental=false"
 
 jobs:
-  validation:
-    name: "Validation"
+  build:
+    name: "Build"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
 
+      - name: Configure JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 11
+
+      - name: Build Project
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build
+
+      - name: Build Sample
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build
+          build-root-directory: sample
+
+      - name: Publish Test Report
+        if: success() || failure()
+        uses: mikepenz/action-junit-report@v3
+        with:
+          report_paths: '**/build/test-results/test/TEST-*.xml'
+
   lint:
     name: "Lint"
     runs-on: ubuntu-latest
@@ -42,32 +65,3 @@ jobs:
       - uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
-
-  build:
-    name: "Build"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Configure JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 11
-
-      - name: Build Project
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
-
-      - name: Build Sample
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
-          build-root-directory: sample
-
-      - name: Publish Test Report
-        if: success() || failure()
-        uses: mikepenz/action-junit-report@v3
-        with:
-          report_paths: '**/build/test-results/test/TEST-*.xml'