diff --git a/.github/renovate.json b/.github/renovate.json index dab5a592..7f35bf0c 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -13,6 +13,7 @@ ], "baseBranches": [ "main", + "/^release-1\\..*/", "/^1\\..*\\.x/" ], "constraints": { @@ -71,9 +72,9 @@ ] }, { - "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" ], @@ -81,6 +82,7 @@ "patch" ], "baseBranches": [ + "/^release-1\\..*/", "/^1\\..*\\.x/" ], "automerge": false, @@ -112,9 +114,9 @@ ] }, { - "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" ], @@ -122,6 +124,7 @@ "patch" ], "baseBranches": [ + "/^release-1\\..*/", "/^1\\..*\\.x/" ], "automerge": false, @@ -149,9 +152,9 @@ ] }, { - "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" ], @@ -159,6 +162,7 @@ "patch" ], "baseBranches": [ + "/^release-1\\..*/", "/^1\\..*\\.x/" ], "automerge": false, diff --git a/.github/workflows/next-container-build.yaml b/.github/workflows/next-container-build.yaml index 47810f15..3ac19158 100644 --- a/.github/workflows/next-container-build.yaml +++ b/.github/workflows/next-container-build.yaml @@ -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: @@ -21,6 +21,7 @@ on: - main - rhdh-1.[0-9]+ - 1.[0-9]+.x + - release-1.[0-9]+ concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -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 diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index b04c2658..d477716d 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -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 diff --git a/.github/workflows/pr-bundle-diff-checks.yaml b/.github/workflows/pr-bundle-diff-checks.yaml index f58fb2a0..5fe7a19b 100644 --- a/.github/workflows/pr-bundle-diff-checks.yaml +++ b/.github/workflows/pr-bundle-diff-checks.yaml @@ -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 }} diff --git a/.github/workflows/pr-container-build.yaml b/.github/workflows/pr-container-build.yaml index cb1af305..1857142a 100644 --- a/.github/workflows/pr-container-build.yaml +++ b/.github/workflows/pr-container-build.yaml @@ -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 }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 27675de6..9978a325 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -20,6 +20,7 @@ on: - main - rhdh-1.[0-9]+ - 1.[0-9]+.x + - release-1.[0-9]+ jobs: pr-validate: