Use new workflows with CI profile.

jenkinsci · May 7, 2024 · 2917623 · 2917623
1 parent 8c678c3
commit 2917623
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 72 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,6 @@ name: 'GitHub CI'
 on:
   push:
     branches:
-      - master
       - main
   pull_request:
 
@@ -34,4 +33,4 @@ jobs:
       - name: Build with Maven
         env:
           BROWSER: chrome-container
-        run: mvn -V --color always -ntp clean verify --file pom.xml '-Djenkins.test.timeout=5000' '-Dgpg.skip'
+        run: mvn -V --color always -ntp clean verify pom.xml '-Djenkins.test.timeout=5000' '-Dgpg.skip' '-Pci'
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -49,7 +49,7 @@ jobs:
           queries: +security-and-quality
 
       - name: Build with Maven
-        run: mvn -V --color always -ntp clean verify --file pom.xml -Pskip
+        run: mvn -V --color always -ntp clean verify pom.xml -Pskip
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -3,7 +3,6 @@ name: 'CodeCov'
 on:
   push:
     branches:
-      - master
       - main
   pull_request:
 
@@ -27,7 +26,7 @@ jobs:
         with:
           maven-version: 3.9.6
       - name: Generate coverage with JaCoCo
-        run: mvn -V --color always -ntp clean verify '-Dgpg.skip'
+        run: mvn -V --color always -ntp clean verify -Dgpg.skip -Pci
       - name: Upload coverage to Codecov
         uses: codecov/[email protected]
         with:

diff --git a/.github/workflows/quality-monitor.yml b/.github/workflows/quality-monitor.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Build with Maven
         env:
           BROWSER: chrome-container
-        run: mvn -V --color always -ntp clean verify | tee maven.log
+        run: mvn -V --color always -ntp clean verify -Ppit -Pci | tee maven.log
       - name: Extract pull request number
         uses: jwalton/gh-find-current-pr@v1
         id: pr
@@ -34,69 +34,3 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           pr-number: ${{ steps.pr.outputs.number }}
-          config: >
-            {
-            "tests": {
-              "tools": [
-                {
-                  "id": "test",
-                  "name": "Tests",
-                  "pattern": "**/target/*-reports/TEST*.xml"
-                }
-              ],
-              "name": "Tests"
-            },
-            "analysis": [
-              {
-                "name": "Style",
-                "id": "style",
-                "tools": [
-                  {
-                    "id": "checkstyle",
-                    "name": "CheckStyle",
-                    "pattern": "**/target/checkstyle-*/checkstyle-result.xml"
-                  },
-                  {
-                    "id": "pmd",
-                    "name": "PMD",
-                    "pattern": "**/target/pmd-*/pmd.xml"
-                  }
-                ]
-              },
-              {
-                "name": "Bugs",
-                "id": "bugs",
-                "icon": "bug",
-                "tools": [
-                  {
-                    "id": "spotbugs",
-                    "name": "SpotBugs",
-                    "sourcePath": "src/main/java",
-                    "pattern": "**/target/spotbugsXml.xml"
-                  }
-                ]
-              }
-            ],
-            "coverage": [
-              {
-                "name": "Code Coverage",
-                "tools": [
-                  {
-                    "id": "jacoco",
-                    "name": "Line Coverage",
-                    "metric": "line",
-                    "sourcePath": "src/main/java",
-                    "pattern": "**/target/site/jacoco/jacoco.xml"
-                  },
-                  {
-                    "id": "jacoco",
-                    "name": "Branch Coverage",
-                    "metric": "branch",
-                    "sourcePath": "src/main/java",
-                    "pattern": "**/target/site/jacoco/jacoco.xml"
-                  }
-                ]
-              }
-             ]
-            }
-