From 0c442a231083b1233aa3c4461a04c84093c59d0d Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 13 Sep 2022 14:22:30 +0200 Subject: [PATCH 1/2] feat: cicd for client v5.x releases --- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 14 ++++++++++++++ .github/workflows/snapshot-releases.yml | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 429e49cd5b..263208b495 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ on: pull_request: paths-ignore: - 'docs/**' - branches: [ main, v1, v2, next ] + branches: [ main, main-c5, v1, v2, next ] workflow_dispatch: jobs: check_format_and_unit_tests: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6fe3bd9dab..60a8ae87c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,10 @@ jobs: if: ${{ startsWith(github.event.release.tag_name, 'v2.') }} with: ref: "v2" + - uses: actions/checkout@v3 + if: ${{ endsWith(github.event.release.tag_name, 'c5') }} + with: + ref: "main-c5" - uses: actions/checkout@v3 if: ${{ startsWith(github.event.release.tag_name, 'v3.') }} - name: Set up Java and Maven @@ -57,6 +61,10 @@ jobs: if: ${{ startsWith(github.event.release.tag_name, 'v2.') }} with: ref: "v2" + - uses: actions/checkout@v3 + if: ${{ endsWith(github.event.release.tag_name, 'c5') }} + with: + ref: "main-c5" - uses: actions/checkout@v3 if: ${{ startsWith(github.event.release.tag_name, 'v3.') }} - name: Set up Java and Maven @@ -86,6 +94,12 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} branch: "v2" + - name: Push changes v2 + uses: ad-m/github-push-action@master + if: ${{ endsWith(github.event.release.tag_name, 'c5') }} + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: "main-c5" - name: Push changes v3 uses: ad-m/github-push-action@master if: ${{ startsWith(github.event.release.tag_name, 'v3.' ) }} diff --git a/.github/workflows/snapshot-releases.yml b/.github/workflows/snapshot-releases.yml index 866e50e133..093c7319e2 100644 --- a/.github/workflows/snapshot-releases.yml +++ b/.github/workflows/snapshot-releases.yml @@ -10,7 +10,7 @@ on: push: paths-ignore: - 'docs/**' - branches: [ main, v1, v2, next ] + branches: [ main, main-c5, v1, v2, next ] workflow_dispatch: jobs: test: From c9bdd60948f32fe190b2f13bf2e3ebabdba7fc04 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 13 Sep 2022 21:42:05 +0200 Subject: [PATCH 2/2] chore: change branch name to main-f8-5.x --- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 12 ++++++------ .github/workflows/snapshot-releases.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 263208b495..7c20d08fe0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ on: pull_request: paths-ignore: - 'docs/**' - branches: [ main, main-c5, v1, v2, next ] + branches: [ main, main-f8-5.x, v1, v2, next ] workflow_dispatch: jobs: check_format_and_unit_tests: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 60a8ae87c5..6a8da1687a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,9 +17,9 @@ jobs: with: ref: "v2" - uses: actions/checkout@v3 - if: ${{ endsWith(github.event.release.tag_name, 'c5') }} + if: ${{ endsWith(github.event.release.tag_name, 'f8-5.x') }} with: - ref: "main-c5" + ref: "main-f8-5.x" - uses: actions/checkout@v3 if: ${{ startsWith(github.event.release.tag_name, 'v3.') }} - name: Set up Java and Maven @@ -62,9 +62,9 @@ jobs: with: ref: "v2" - uses: actions/checkout@v3 - if: ${{ endsWith(github.event.release.tag_name, 'c5') }} + if: ${{ endsWith(github.event.release.tag_name, 'f8-5.x') }} with: - ref: "main-c5" + ref: "main-f8-5.x" - uses: actions/checkout@v3 if: ${{ startsWith(github.event.release.tag_name, 'v3.') }} - name: Set up Java and Maven @@ -96,10 +96,10 @@ jobs: branch: "v2" - name: Push changes v2 uses: ad-m/github-push-action@master - if: ${{ endsWith(github.event.release.tag_name, 'c5') }} + if: ${{ endsWith(github.event.release.tag_name, 'f8-5.x') }} with: github_token: ${{ secrets.GITHUB_TOKEN }} - branch: "main-c5" + branch: "main-f8-5.x" - name: Push changes v3 uses: ad-m/github-push-action@master if: ${{ startsWith(github.event.release.tag_name, 'v3.' ) }} diff --git a/.github/workflows/snapshot-releases.yml b/.github/workflows/snapshot-releases.yml index 093c7319e2..e5f7d1c320 100644 --- a/.github/workflows/snapshot-releases.yml +++ b/.github/workflows/snapshot-releases.yml @@ -10,7 +10,7 @@ on: push: paths-ignore: - 'docs/**' - branches: [ main, main-c5, v1, v2, next ] + branches: [ main, main-f8-5.x, v1, v2, next ] workflow_dispatch: jobs: test: