From 3ee77d4a34236d2d322a05667b8ac0d1e488c88c Mon Sep 17 00:00:00 2001 From: i302705 Date: Mon, 27 Jul 2026 09:35:36 +0300 Subject: [PATCH] chore: Improve GH workflows --- .github/workflows/main.yml | 12 ++++++++---- .github/workflows/pr.yml | 13 +++++++------ .github/workflows/release.yml | 10 ++++++---- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb31fc0..9f5f4fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,7 @@ name: CI - MAIN env: + JAVA_VERSION: '21' MAVEN_VERSION: "3.9.16" on: @@ -22,11 +23,14 @@ jobs: - name: Scan With Black Duck uses: cap-java/.github/actions/scan-with-blackduck@main with: - blackduck_token: ${{ secrets.BLACK_DUCK_TOKEN }} - maven-version: ${{ env.MAVEN_VERSION }} - project-name: com.sap.cds.feature.ord - included-modules: cds-feature-ord scan_mode: FULL + included-modules: cds-feature-ord + project-name: com.sap.cds.feature.ord + excluded-dirs: '**/*test*,**/target/site' + java-version: ${{ env.JAVA_VERSION }} + maven-version: ${{ env.MAVEN_VERSION }} + github_token: ${{ secrets.GITHUB_TOKEN }} + blackduck_token: ${{ secrets.BLACK_DUCK_TOKEN }} build-and-test: uses: ./.github/workflows/pipeline.yml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index af0a2a0..9f69cff 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,6 +1,7 @@ name: CI - PR env: + JAVA_VERSION: '21' MAVEN_VERSION: "3.9.16" on: @@ -23,14 +24,14 @@ jobs: - name: Scan With Black Duck uses: cap-java/.github/actions/scan-with-blackduck@main with: - github_token: ${{ secrets.GITHUB_TOKEN }} - blackduck_token: ${{ secrets.BLACK_DUCK_TOKEN }} - java-version: 21 - maven-version: ${{ env.MAVEN_VERSION }} - project-name: com.sap.cds.feature.ord - included-modules: cds-feature-ord scan_mode: RAPID + included-modules: cds-feature-ord + project-name: com.sap.cds.feature.ord excluded-dirs: '**/*test*,**/target/site' + java-version: ${{ env.JAVA_VERSION }} + maven-version: ${{ env.MAVEN_VERSION }} + github_token: ${{ secrets.GITHUB_TOKEN }} + blackduck_token: ${{ secrets.BLACK_DUCK_TOKEN }} # rapid_compare_mode: BOM_COMPARE # PRs might only be blocked by things they introduce, not by pre-existing issues that could have appeared in the main branch in the meantime build-and-test: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b93163f..3e9d20a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -72,12 +72,14 @@ jobs: - name: Scan With Black Duck uses: cap-java/.github/actions/scan-with-blackduck@main with: - blackduck_token: ${{ secrets.BLACK_DUCK_TOKEN }} - github_token: ${{ secrets.GITHUB_TOKEN }} - maven-version: ${{ env.MAVEN_VERSION }} - project-name: com.sap.cds.feature.ord included-modules: cds-feature-ord + project-name: com.sap.cds.feature.ord + excluded-dirs: '**/*test*,**/target/site' + java-version: ${{ env.JAVA_VERSION }} + maven-version: ${{ env.MAVEN_VERSION }} + github_token: ${{ secrets.GITHUB_TOKEN }} version: ${{ github.event.release.tag_name }} + blackduck_token: ${{ secrets.BLACK_DUCK_TOKEN }} build: name: Build