Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for branch rename #860

Merged
merged 1 commit into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,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
Expand Down