From 3b889064267d4199ca2eb13e97b9ebd58d4fdd57 Mon Sep 17 00:00:00 2001
From: Gang Li <ligangty@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:07:37 +0800
Subject: [PATCH] Separate github action to verify and push for pr open and
 merged phases

  This is a following fix for 1462f846f
---
 .../{maven-build.yml => maven-push.yml}       | 44 ++---------------
 .github/workflows/maven-verify.yml            | 49 +++++++++++++++++++
 2 files changed, 52 insertions(+), 41 deletions(-)
 rename .github/workflows/{maven-build.yml => maven-push.yml} (76%)
 create mode 100644 .github/workflows/maven-verify.yml

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-push.yml
similarity index 76%
rename from .github/workflows/maven-build.yml
rename to .github/workflows/maven-push.yml
index ef3c59662f..68b39dbe56 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-push.yml
@@ -17,48 +17,11 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: build on maven
+name: maven push
 
-on:
-  watch:
-    types: [started]
-  pull_request:
-    types: [opened, reopened, edited, synchronize, ready_for_review]
-  push:
-    branches:
-      - main
-      - master
-      - '**'
-
-  workflow_dispatch:
+on: [push]
 
 jobs:
-  verify:
-    name: verify with maven
-    runs-on: ubuntu-latest
-    env:
-      MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m"
-      SKIP_NPM_CONFIG: false
-      NPMREGISTRY: https://registry.npmjs.org
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Set up JDK 8 & 11 for x64
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        architecture: x64
-        java-version: |
-          8
-          11
-
-    - uses: s4u/maven-settings-action@v2.8.0
-      with:
-        sonatypeSnapshots: true
-
-    - name: Build the Maven verify phase
-      run: mvn -B -V clean verify -Prun-its -Pci --global-toolchains .github/workflows/toolchains.xml
-
   build:
     name: Build and push
     runs-on: ubuntu-latest
@@ -71,13 +34,12 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up JDK 8 & 11 for x64
+    - name: Set up JDK 11 for x64
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         architecture: x64
         java-version: |
-          8
           11
 
     - uses: s4u/maven-settings-action@v2.8.0
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
new file mode 100644
index 0000000000..e7f7f22ea9
--- /dev/null
+++ b/.github/workflows/maven-verify.yml
@@ -0,0 +1,49 @@
+#
+# Copyright (C) 2011-2023 Red Hat, Inc. (https://github.com/Commonjava/indy)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: maven verify
+
+on: [pull_request]
+
+jobs:
+  verify:
+    name: verify with maven
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'push' }}
+    env:
+      MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m"
+      SKIP_NPM_CONFIG: false
+      NPMREGISTRY: https://registry.npmjs.org
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up JDK 11 for x64
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        architecture: x64
+        java-version: |
+          11
+
+    - uses: s4u/maven-settings-action@v2.8.0
+      with:
+        sonatypeSnapshots: true
+
+    - name: Build the Maven verify phase
+      run: mvn -B -V clean verify -Prun-its -Pci --global-toolchains .github/workflows/toolchains.xml