From 9ebac1cdfc1f314fd85dae4368473a4368ba9927 Mon Sep 17 00:00:00 2001
From: Hongchol Sinn <hsinn@vmware.com>
Date: Wed, 4 Oct 2023 16:24:20 -0700
Subject: [PATCH] Change main GitHub workflow config for unit-testing to use
 Java11 and remove the temporary Java11-branch-only config.

[#184142402]
---
 .github/workflows/unit-test-java11.yml | 22 ----------------------
 .github/workflows/unit-test.yml        |  7 ++-----
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 .github/workflows/unit-test-java11.yml

diff --git a/.github/workflows/unit-test-java11.yml b/.github/workflows/unit-test-java11.yml
deleted file mode 100644
index 285f2778c..000000000
--- a/.github/workflows/unit-test-java11.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: unit-test-java11
-
-on:
-  push:
-    branches:
-      - '**java11'
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'liberica'
-          java-version: '11'
-      - name: Build and test with Gradle
-        run: ./gradlew clean build
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 86e2d97d4..21f1c461a 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -1,9 +1,6 @@
 name: unit-test
 
-on:
-  push:
-    branches-ignore:
-      - '**java11'
+on: [push]
 
 permissions:
   contents: read
@@ -17,6 +14,6 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'liberica'
-          java-version: '8'
+          java-version: '11'
       - name: Build and test with Gradle
         run: ./gradlew clean build