From 20536fd595e5b449e7fdddfe6b44421130ef5953 Mon Sep 17 00:00:00 2001 From: MicRyc Date: Wed, 13 Mar 2024 10:37:07 +0100 Subject: [PATCH 1/3] Add v2 and v31 trigger option to workflows --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/deploy-docker.yml | 2 +- .github/workflows/dockerhub-release.yaml | 2 +- .github/workflows/maven-pulls.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/prepare-release.yml | 2 +- .github/workflows/release.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index dd11bbe4..c0a95e31 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,7 +2,7 @@ name: "Code scanning - action" on: push: - branches: ["master"] + branches: ["master", "v2", "v31"] pull_request: # The branches below must be a subset of the branches above branches: ["master"] diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index 628430f4..17a7427f 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -2,7 +2,7 @@ name: Deploy Docker on: workflow_dispatch: - branches: ["master"] + branches: ["master", "v2", "v31"] inputs: tag: description: tag/version to deploy diff --git a/.github/workflows/dockerhub-release.yaml b/.github/workflows/dockerhub-release.yaml index 2aabe053..f7dc3c0c 100644 --- a/.github/workflows/dockerhub-release.yaml +++ b/.github/workflows/dockerhub-release.yaml @@ -2,7 +2,7 @@ name: Docker Release on: workflow_dispatch: - branches: ["master"] + branches: ["master", "v2", "v31"] inputs: tag: description: tag/version to release diff --git a/.github/workflows/maven-pulls.yml b/.github/workflows/maven-pulls.yml index 6004ae99..dd868e5b 100644 --- a/.github/workflows/maven-pulls.yml +++ b/.github/workflows/maven-pulls.yml @@ -2,7 +2,7 @@ name: Build Test PR on: pull_request: - branches: [ "master" ] + branches: ["master", "v2", "v31"] jobs: build: diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e622cc1f..d19c0f59 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -2,7 +2,7 @@ name: Build Test master on: push: - branches: [ "master" ] + branches: ["master", "v2", "v31"] jobs: build: diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index a1d9a0ca..c5fd61cb 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -2,7 +2,7 @@ name: Prepare Release on: workflow_dispatch: - branches: ["master"] + branches: ["master", "v2", "v31"] jobs: build: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e24d01bf..79ab6c3e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: workflow_dispatch: - branches: ["master"] + branches: ["master", "v2", "v31"] jobs: build: From d5e76df6d52f9820bf04049f162517ea0e67180b Mon Sep 17 00:00:00 2001 From: MicRyc Date: Mon, 18 Mar 2024 17:17:07 +0100 Subject: [PATCH 2/3] Fix workflow branches names --- .github/workflows/deploy-docker.yml | 2 +- .github/workflows/dockerhub-release.yaml | 2 +- .github/workflows/maven-pulls.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/prepare-release.yml | 2 +- .github/workflows/release.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index 17a7427f..628430f4 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -2,7 +2,7 @@ name: Deploy Docker on: workflow_dispatch: - branches: ["master", "v2", "v31"] + branches: ["master"] inputs: tag: description: tag/version to deploy diff --git a/.github/workflows/dockerhub-release.yaml b/.github/workflows/dockerhub-release.yaml index f7dc3c0c..2aabe053 100644 --- a/.github/workflows/dockerhub-release.yaml +++ b/.github/workflows/dockerhub-release.yaml @@ -2,7 +2,7 @@ name: Docker Release on: workflow_dispatch: - branches: ["master", "v2", "v31"] + branches: ["master"] inputs: tag: description: tag/version to release diff --git a/.github/workflows/maven-pulls.yml b/.github/workflows/maven-pulls.yml index dd868e5b..66f8abf0 100644 --- a/.github/workflows/maven-pulls.yml +++ b/.github/workflows/maven-pulls.yml @@ -2,7 +2,7 @@ name: Build Test PR on: pull_request: - branches: ["master", "v2", "v31"] + branches: ["master"] jobs: build: diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d19c0f59..339ce466 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -2,7 +2,7 @@ name: Build Test master on: push: - branches: ["master", "v2", "v31"] + branches: ["master"] jobs: build: diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index c5fd61cb..a1d9a0ca 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -2,7 +2,7 @@ name: Prepare Release on: workflow_dispatch: - branches: ["master", "v2", "v31"] + branches: ["master"] jobs: build: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 79ab6c3e..e24d01bf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: workflow_dispatch: - branches: ["master", "v2", "v31"] + branches: ["master"] jobs: build: From 884c6418f29036635b80102b74e87233b7e88749 Mon Sep 17 00:00:00 2001 From: MicRyc Date: Mon, 25 Mar 2024 11:03:49 +0100 Subject: [PATCH 3/3] Add v2 and v31 branches for maven test on push/pr --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/maven-pulls.yml | 2 +- .github/workflows/maven.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c0a95e31..459ccadf 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -5,7 +5,7 @@ on: branches: ["master", "v2", "v31"] pull_request: # The branches below must be a subset of the branches above - branches: ["master"] + branches: ["master", "v2", "v31"] schedule: - cron: '0 19 * * 1' diff --git a/.github/workflows/maven-pulls.yml b/.github/workflows/maven-pulls.yml index 66f8abf0..dd868e5b 100644 --- a/.github/workflows/maven-pulls.yml +++ b/.github/workflows/maven-pulls.yml @@ -2,7 +2,7 @@ name: Build Test PR on: pull_request: - branches: ["master"] + branches: ["master", "v2", "v31"] jobs: build: diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 339ce466..d19c0f59 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -2,7 +2,7 @@ name: Build Test master on: push: - branches: ["master"] + branches: ["master", "v2", "v31"] jobs: build: