Skip to content

Commit

Permalink
chore(branch): create release-1.3 branch from 1.3.x; refactor actions…
Browse files Browse the repository at this point in the history
… (RHIDP-4031)

Signed-off-by: Nick Boldt <nboldt@redhat.com>
  • Loading branch information
nickboldt committed Sep 18, 2024
1 parent cd69a29 commit af6a884
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 9 deletions.
16 changes: 10 additions & 6 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
],
"baseBranches": [
"main",
"/^release-1\\..*/",
"/^1\\..*\\.x/"
],
"constraints": {
Expand Down Expand Up @@ -71,16 +72,17 @@
]
},
{
"description": "k8s go: patch updates only in 1.y.x (suspended till UBI w/ go 1.22)",
"description": "k8s go: patch updates only in 1.y (suspended till UBI w/ go 1.22)",
"enabled": false,
"groupName": "k8s-go 1.y.x",
"groupName": "k8s-go 1.y",
"matchDatasources": [
"go"
],
"matchUpdateTypes": [
"patch"
],
"baseBranches": [
"/^release-1\\..*/",
"/^1\\..*\\.x/"
],
"automerge": false,
Expand Down Expand Up @@ -112,16 +114,17 @@
]
},
{
"description": "ginkgo: patch updates only in 1.y.x",
"description": "ginkgo: patch updates only in 1.y",
"enabled": true,
"groupName": "ginkgo 1.y.x",
"groupName": "ginkgo 1.y",
"matchDatasources": [
"go"
],
"matchUpdateTypes": [
"patch"
],
"baseBranches": [
"/^release-1\\..*/",
"/^1\\..*\\.x/"
],
"automerge": false,
Expand Down Expand Up @@ -149,16 +152,17 @@
]
},
{
"description": "gomega: patch updates only in 1.y.x",
"description": "gomega: patch updates only in 1.y",
"enabled": true,
"groupName": "gomega 1.y.x",
"groupName": "gomega 1.y",
"matchDatasources": [
"go"
],
"matchUpdateTypes": [
"patch"
],
"baseBranches": [
"/^release-1\\..*/",
"/^1\\..*\\.x/"
],
"automerge": false,
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/next-container-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# for main branch, use next tags; for 1.x branches, use :latest tags
# for main branch, use next tags; for 1.y branches, use :latest tags
name: Build and push operator, bundle, and catalog images

on:
Expand All @@ -21,6 +21,7 @@ on:
- main
- rhdh-1.[0-9]+
- 1.[0-9]+.x
- release-1.[0-9]+

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -94,7 +95,7 @@ jobs:
export CONTAINER_ENGINE=podman
latestNext="next"
# for main branch, use next tags; for 1.x branches, use :latest tags
# for main branch, use next tags; for 1.y branches, use :latest tags
if [[ $(git rev-parse --abbrev-ref HEAD) != "main" ]]; then
latestNext="latest"
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branch: [ main, 1.3.x, 1.2.x, 1.1.x ]
branch: [ main, release-1.3, 1.2.x, 1.1.x ]
test_upgrade: [ 'true', 'false' ]
exclude:
- branch: 1.1.x # Testing upgrade from 1.1.x
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr-bundle-diff-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ on:
- main
- rhdh-1.[0-9]+
- 1.[0-9]+.x
- release-1.[0-9]+

concurrency:
group: ${{ github.workflow }}-${{ github.event.number }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr-container-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ on:
- main
- rhdh-1.[0-9]+
- 1.[0-9]+.x
- release-1.[0-9]+

concurrency:
group: ${{ github.workflow }}-${{ github.event.number || github.event.pull_request.head.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ on:
- main
- rhdh-1.[0-9]+
- 1.[0-9]+.x
- release-1.[0-9]+

jobs:
pr-validate:
Expand Down

0 comments on commit af6a884

Please sign in to comment.