From 436c991de617dc8cbce8dae517c6a3487e5b054b Mon Sep 17 00:00:00 2001
From: daf-LF <dferguson@linuxfoundation.org>
Date: Wed, 16 Oct 2024 15:18:21 -0700
Subject: [PATCH] Changes for branch rename (#860)

Signed-off-by: David Ferguson <dferguson@linuxfoundation.org>
---
 .github/workflows/{master.yml => main.yml} |  6 +++---
 .github/workflows/push.yml                 | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename .github/workflows/{master.yml => main.yml} (98%)

diff --git a/.github/workflows/master.yml b/.github/workflows/main.yml
similarity index 98%
rename from .github/workflows/master.yml
rename to .github/workflows/main.yml
index e1513dcc4..bc01b7288 100644
--- a/.github/workflows/master.yml
+++ b/.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
index e7e5d3d33..8562fb6e0 100644
--- 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,9 +32,9 @@ 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
@@ -42,9 +42,9 @@ jobs:
           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