From 5e5dd79c025807c7b269c5acf2ccbe665ee25836 Mon Sep 17 00:00:00 2001 From: Automated Release Date: Mon, 3 Jun 2024 23:10:03 +0000 Subject: [PATCH] Update Shipyard to use stable branch 'release-0.18' Signed-off-by: Automated Release --- .github/workflows/branch.yml | 4 ++-- .github/workflows/consuming.yml | 6 +++--- .github/workflows/release.yml | 2 +- .github/workflows/report.yml | 2 +- .github/workflows/upgrade-e2e.yml | 2 +- Makefile | 2 +- Makefile.versions | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index 1a9dc9b01..e74450611 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -11,6 +11,6 @@ jobs: name: PR targets branch runs-on: ubuntu-latest steps: - - name: Check that the PR targets devel - if: ${{ github.base_ref != 'devel' }} + - name: Check that the PR targets release-0.18 + if: ${{ github.base_ref != 'release-0.18' }} run: exit 1 diff --git a/.github/workflows/consuming.yml b/.github/workflows/consuming.yml index 8745652b1..6374fbbd2 100644 --- a/.github/workflows/consuming.yml +++ b/.github/workflows/consuming.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 with: # This is replaced to stable branch by auto release process - ref: devel + ref: release-0.18 repository: submariner-io/${{ matrix.project }} # Check out Shipyard as a sub directory of the project, so that `go replace` can work. @@ -92,7 +92,7 @@ jobs: uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 with: # This is replaced to stable branch by auto release process - ref: devel + ref: release-0.18 repository: submariner-io/${{ matrix.project }} path: ${{ matrix.project }} @@ -147,7 +147,7 @@ jobs: uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 with: # This is replaced to stable branch by auto release process - ref: devel + ref: release-0.18 repository: submariner-io/${{ matrix.project }} path: ${{ matrix.project }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee9ff3d51..e1b3fe59a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: push: branches: - - devel + - release-0.18 - release-* permissions: {} diff --git a/.github/workflows/report.yml b/.github/workflows/report.yml index 673e9aec4..f3f54ac7a 100644 --- a/.github/workflows/report.yml +++ b/.github/workflows/report.yml @@ -4,7 +4,7 @@ name: Reporting on: push: branches: - - devel + - release-0.18 - release-* permissions: {} diff --git a/.github/workflows/upgrade-e2e.yml b/.github/workflows/upgrade-e2e.yml index 5193321e9..f4f15c8e5 100644 --- a/.github/workflows/upgrade-e2e.yml +++ b/.github/workflows/upgrade-e2e.yml @@ -3,7 +3,7 @@ name: Upgrade on: pull_request: - branches: [devel] + branches: [release-0.18] permissions: {} diff --git a/Makefile b/Makefile index a2471c13b..d2d8c2c1e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BASE_BRANCH ?= devel +BASE_BRANCH ?= release-0.18 OCM_BASE_BRANCH ?= main IMAGES ?= shipyard-dapper-base shipyard-linting nettest MULTIARCH_IMAGES ?= nettest diff --git a/Makefile.versions b/Makefile.versions index aca450ff5..7ff1f1a62 100644 --- a/Makefile.versions +++ b/Makefile.versions @@ -1,5 +1,5 @@ # Calculate versions; these can be overridden -CUTTING_EDGE := devel +CUTTING_EDGE := release-0.18 DEV_VERSION := dev override CALCULATED_VERSION := $(BASE_BRANCH)-$(shell git rev-parse --short=12 HEAD) VERSION ?= $(CALCULATED_VERSION)