From f9a29180acc7486f4174afff1479e0b994093cb9 Mon Sep 17 00:00:00 2001 From: daf-LF Date: Wed, 16 Oct 2024 14:24:49 -0700 Subject: [PATCH] Changes to accomodate branch rename (#89) Signed-off-by: David Ferguson --- .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} (97%) diff --git a/.github/workflows/master.yml b/.github/workflows/main.yml similarity index 97% rename from .github/workflows/master.yml rename to .github/workflows/main.yml index a0bb4bd..3f4fce1 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/main.yml @@ -1,15 +1,15 @@ # SPDX-License-Identifier: Apache-2.0 # 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 386242a..031ff5e 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,16 +32,16 @@ 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 run: | 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