From 43e9075e9caa6d24cf620ceccb21cd891945a151 Mon Sep 17 00:00:00 2001
From: ndr_brt <andrea.bertagnolli@gmail.com>
Date: Wed, 21 Aug 2024 14:47:32 +0200
Subject: [PATCH] ci: launch test workflow also on release and bugfix branches

---
 .github/workflows/checkstyle.yaml      | 29 ---------------
 .github/workflows/codeql-analysis.yml  | 50 --------------------------
 .github/workflows/dependency-check.yml | 14 --------
 .github/workflows/test.yaml            | 20 ++++++++++-
 4 files changed, 19 insertions(+), 94 deletions(-)
 delete mode 100644 .github/workflows/checkstyle.yaml
 delete mode 100644 .github/workflows/codeql-analysis.yml
 delete mode 100644 .github/workflows/dependency-check.yml

diff --git a/.github/workflows/checkstyle.yaml b/.github/workflows/checkstyle.yaml
deleted file mode 100644
index 99ac61dd..00000000
--- a/.github/workflows/checkstyle.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Check Code Style
-
-on:
-  push:
-  pull_request:
-    branches: [ main ]
-    paths-ignore:
-      - '**.md'
-      - 'docs/**'
-      - 'CODEOWNERS'
-      - 'LICENSE'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  Checkstyle:
-    permissions:
-      id-token: write
-      checks: write
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: eclipse-edc/.github/.github/actions/setup-build@main
-
-      - name: Run Checkstyle
-        run: ./gradlew checkstyleMain checkstyleTest
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index ac502221..00000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-  pull_request:
-    branches: [ main ]
-    paths-ignore:
-      - '**.md'
-      - 'docs/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: eclipse-edc/.github/.github/actions/setup-build@main
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: ${{ matrix.language }}
-          queries: +security-and-quality
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-      # Compiles production Java source (without tests)
-      - name: Build
-        run: ./gradlew compileJava --no-daemon
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml
deleted file mode 100644
index e56a6daf..00000000
--- a/.github/workflows/dependency-check.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: 'Dependency Review'
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  check:
-    uses: eclipse-edc/.github/.github/workflows/dependency-check.yml@main
-    secrets: inherit
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 8c6021dd..c1a11c3a 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
   pull_request:
-    branches: [ main ]
+    branches: [ main, release/*, bugfix/* ]
     paths-ignore:
       - '**.md'
       - 'docs/**'
@@ -16,6 +16,24 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+
+  Checkstyle:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: eclipse-edc/.github/.github/actions/setup-build@main
+
+      - name: Run Checkstyle
+        run: ./gradlew checkstyleMain checkstyleTest
+
+  CodeQL:
+    uses: eclipse-edc/.github/.github/workflows/codeql-analysis.yml@main
+    secrets: inherit
+
+  Dependency-Check:
+    uses: eclipse-edc/.github/.github/workflows/dependency-check.yml@main
+    secrets: inherit
+
   Unit-Tests:
     runs-on: ubuntu-latest
     steps: