Changes for branch rename (#860)

Signed-off-by: David Ferguson <[email protected]>
omec-project · Oct 16, 2024 · 436c991 · 436c991
1 parent 80dc1b7
commit 436c991
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/master.yml → .github/workflows/main.yml b/.github/workflows/master.yml → .github/workflows/main.yml
@@ -2,15 +2,15 @@
 # Copyright 2023 Canonical Ltd.
 # Copyright 2024 Intel Corporation
 
-name: Master workflow
+name: Main workflow
 
 on:
   pull_request:
     branches:
-      - master
+      - main
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -5,7 +5,7 @@ name: GitHub release and Docker images
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - v*
 
@@ -32,19 +32,19 @@ jobs:
           username: ${{ secrets.AETHER_REGISTRY_USERNAME }}
           password: ${{ secrets.AETHER_REGISTRY_PASSWORD }}
 
-      - name: Build and push "master-latest" Docker image
+      - name: Build and push "main-latest" Docker image
         env:
-          DOCKER_TAG: master-latest
+          DOCKER_TAG: main-latest
           CPU: haswell
         run: |
           docker pull ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}upf-epc-bess:$DOCKER_TAG
           docker pull ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}upf-epc-pfcpiface:$DOCKER_TAG
           CPU=$CPU make docker-build
           make docker-push
 
-      - name: Build and push "master-GIT_SHA" Docker image
+      - name: Build and push "main-GIT_SHA" Docker image
         env:
-          DOCKER_TAG: master-${{ env.GIT_SHA_SHORT }}
+          DOCKER_TAG: main-${{ env.GIT_SHA_SHORT }}
         run: |
           make docker-build
           make docker-push