Skip to content

Commit

Permalink
Changes to support branch rename (#157)
Browse files Browse the repository at this point in the history
Signed-off-by: David Ferguson <dferguson@linuxfoundation.org>
  • Loading branch information
daf-LF authored Oct 16, 2024
1 parent 04ec996 commit e2bc0f2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/master.yml → .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: GitHub release and Docker images
on:
push:
branches:
- master
- main
tags:
- v*

Expand All @@ -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
Expand Down

0 comments on commit e2bc0f2

Please sign in to comment.