Update Shipyard to use stable branch 'release-0.12'

Signed-off-by: Automated Release <[email protected]>
submariner-io · Mar 2, 2022 · b47a1fb · b47a1fb
1 parent 913e6c2
commit b47a1fb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -9,6 +9,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.12
+        if: ${{ github.base_ref != 'release-0.12' }}
         run: exit 1
diff --git a/.github/workflows/consuming.yml b/.github/workflows/consuming.yml
@@ -49,7 +49,7 @@ jobs:
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
         with:
           # This is replaced to stable branch by auto release process
-          ref: devel
+          ref: release-0.12
           repository: submariner-io/${{ matrix.project }}
           path: ${{ matrix.project }}
 
@@ -92,7 +92,7 @@ jobs:
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
         with:
           # This is replaced to stable branch by auto release process
-          ref: devel
+          ref: release-0.12
           repository: submariner-io/${{ matrix.project }}
           path: ${{ matrix.project }}
 
@@ -127,7 +127,7 @@ jobs:
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
         with:
           # This is replaced to stable branch by auto release process
-          ref: devel
+          ref: release-0.12
           repository: submariner-io/${{ matrix.project }}
           path: ${{ matrix.project }}
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ name: Release Images
 on:
   push:
     branches:
-      - devel
+      - release-0.12
       - release-*
 
 jobs:

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-BASE_BRANCH ?= devel
+BASE_BRANCH ?= release-0.12
 OCM_BASE_BRANCH ?= main
 IMAGES ?= shipyard-dapper-base shipyard-linting nettest
 MULTIARCH_IMAGES ?= nettest

diff --git a/Makefile.versions b/Makefile.versions
@@ -1,5 +1,5 @@
 # Calculate versions; these can be overridden
-CUTTING_EDGE := devel
+CUTTING_EDGE := release-0.12
 DEV_VERSION := dev
 override CALCULATED_VERSION := $(BASE_BRANCH)-$(shell git rev-parse --short HEAD)
 VERSION ?= $(CALCULATED_VERSION)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ name: Release Images @@
     on:
       push:
         branches:
-          - devel
+          - release-0.12
           - release-*
     jobs:
@@ Expand Down @@