Update Shipyard to use stable branch 'release-0.10'

Signed-off-by: Automated Release <[email protected]>
submariner-io · Aug 9, 2021 · d218587 · d218587
1 parent 70d0260
commit d218587
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -6,9 +6,9 @@ on:
 
 jobs:
   target_devel:
-    name: PR targets devel
+    name: PR targets release-0.10
     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.10
+        if: ${{ github.base_ref != 'release-0.10' }}
         run: exit 1
diff --git a/.github/workflows/consuming.yml b/.github/workflows/consuming.yml
@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           # This is replaced to stable branch by auto release process
-          ref: devel
+          ref: release-0.10
           repository: submariner-io/${{ matrix.project }}
           path: ${{ matrix.project }}
 
@@ -94,7 +94,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           # This is replaced to stable branch by auto release process
-          ref: devel
+          ref: release-0.10
           repository: submariner-io/${{ matrix.project }}
           path: ${{ matrix.project }}
 
@@ -129,7 +129,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           # This is replaced to stable branch by auto release process
-          ref: devel
+          ref: release-0.10
           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.10
       - release-*
 
 jobs:

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-BASE_BRANCH ?= devel
+BASE_BRANCH ?= release-0.10
 IMAGES ?= shipyard-dapper-base shipyard-linting nettest
 NON_DAPPER_GOALS += images
 SHELLCHECK_ARGS := scripts/shared/lib/*

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.10
 DEV_VERSION := dev
 override CALCULATED_VERSION := $(BASE_BRANCH)-$(shell git rev-parse --short HEAD)
 VERSION ?= $(CALCULATED_VERSION)