Skip to content

Commit

Permalink
Update Shipyard to use stable branch 'release-0.18'
Browse files Browse the repository at this point in the history
Signed-off-by: Automated Release <release@submariner.io>
  • Loading branch information
Automated Release committed Jun 3, 2024
1 parent db01484 commit 5e5dd79
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/consuming.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 }}

Expand Down Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:
push:
branches:
- devel
- release-0.18
- release-*

permissions: {}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Reporting
on:
push:
branches:
- devel
- release-0.18
- release-*

permissions: {}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Upgrade

on:
pull_request:
branches: [devel]
branches: [release-0.18]

permissions: {}

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile.versions
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 5e5dd79

Please sign in to comment.