Merge pull request Aiven-Open#552 from aiven/fix-main-vs-master-2

fix: Replace references to old default branch name
instaclustr · Mar 1, 2023 · 59f20aa · 59f20aa
2 parents 3057a80 + 09f8a8c
commit 59f20aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -36,7 +36,7 @@ jobs:
           # Strip git ref prefix from version
           VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
           # If not tag, then use `develop` as image tag
-          [ "$VERSION" == main -o "$VERSION" == master ] && VERSION=develop
+          [ "$VERSION" == main ] && VERSION=develop
 
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,7 +5,7 @@ on:
     types: [opened, synchronize, reopened]
   push:
     branches:
-      - master
+      - main
 
 jobs:
   tests:
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ on: @@
         types: [opened, synchronize, reopened]
       push:
         branches:
-          - master
+          - main
     jobs:
       tests:
@@ Expand Down @@