Skip to content

Commit

Permalink
added branching process for major versions (Checkmarx#5479)
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaela-soares authored Jun 20, 2022
1 parent ec3496e commit 3ed1506
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go-ci-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: go-ci-integration

on:
pull_request:
branches: [master]
branches: [master, release/1.6]

jobs:
integration-tests:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: go-ci

on:
pull_request:
branches: [master]
branches: [master, release/1.6]

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: go-e2e

on:
pull_request:
branches: [master]
branches: [master, release/1.6]

jobs:
e2e-tests:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kics-gh-action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: kics-github-action

on:
pull_request:
branches: [master]
branches: [master, release/1.6]
workflow_dispatch:

jobs:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: static-analysis

on:
push:
branches:
- master
branches: [master, release/1.6]

jobs:
sonarcloud:
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/sync_major_release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: sync-branches-action

on:
push:
branches: [master]

jobs:
sync-major-release-branch:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Sync Pull Request
uses: repo-sync/pull-request@v2
with:
source_branch: "master"
destination_branch: "release/1.6"
pr_title: "update(branch): sync master to release/1.6"
pr_body: |
**Automated Changes**
- :magic_wand: Syncing master to release/1.6
Triggered by SHA: _${{ github.sha }}_
github_token: ${{ secrets.KICS_BOT_PAT }}

0 comments on commit 3ed1506

Please sign in to comment.