Skip to content

Commit 98a8ffc

Browse files
yash-zededarucoder
authored andcommitted
modified the conditonal trigger, removed an extra docker login command
Signed-off-by: Yash Bagarka <yash@zededa.com>
1 parent c37a7dc commit 98a8ffc

2 files changed

Lines changed: 13 additions & 14 deletions

File tree

.github/workflows/publish.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
11
name: eve-kernel build
2+
23
on:
4+
workflow_dispatch:
35
pull_request_review:
4-
types: [submitted]
5-
pull_request:
6-
types: [opened, synchronize, closed]
6+
types: [ submitted ]
77
push:
88
branches:
99
- "eve-kernel-amd64-v6.1.38-generic"
10-
workflow_dispatch:
10+
1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}
1313
cancel-in-progress: true
14+
1415
jobs:
1516
packages:
1617
runs-on: self-hosted
18+
if: ${{ github.event.review.state == 'approved' || github.ref == 'refs/heads/eve-kernel-amd64-v6.1.38-generic' }}
1719
steps:
1820
- name: Get eve-kernel
1921
uses: actions/checkout@v3
2022
with:
2123
ref: "eve-kernel-amd64-v6.1.38-generic"
22-
- name: Always build eve-kernel-amd64
24+
25+
- name: Build eve-kernel-amd64
2326
run: |
2427
make -f Makefile.eve BRANCH?=${GITHUB_REF##*/} kernel-gcc
28+
2529
- name: Log in to Docker Hub
26-
if: ( github.event_name == 'pull_request' && github.event.pull_request.merged == true ) || github.event_name == 'push' # Only if PR is merged or it was direct push
2730
uses: docker/login-action@v3
2831
with:
2932
username: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
3033
password: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}
31-
- name: Login to DockerHUB
32-
if: ( github.event_name == 'pull_request' && github.event.pull_request.merged == true ) || github.event_name == 'push' # Only if PR is merged or it was direct push
33-
run: |
34-
echo "${{ secrets.RELEASE_DOCKERHUB_TOKEN }}" |\
35-
docker login -u "${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}" --password-stdin
34+
3635
- name: Push eve-kernel-amd64-v6.1.38-generic if PR approved or pushed
37-
if: ( github.event_name == 'pull_request' && github.event.pull_request.merged == true ) || github.event_name == 'push' # Only if PR is merged or it was direct push
36+
if: github.ref == 'refs/heads/eve-kernel-amd64-v6.1.38-generic'
3837
run: |
39-
make -f Makefile.eve BRANCH?=${GITHUB_REF##*/} push-gcc
38+
make -f Makefile.eve BRANCH?=${GITHUB_REF##*/} push-gcc

Makefile.eve

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ push-clang: push-image-clang
7979
docker-tag-generate-%:
8080
@echo "docker.io/lfedge/eve-kernel:$(BRANCH)-$(VERSION)$(DIRTY)-$*"
8181

82-
push-image-%: kernel-%
82+
push-image-%:
8383
$(if $(DIRTY), $(error "Not pushing since the repo is dirty"))
8484
docker push lfedge/eve-kernel:$(BRANCH)-$(VERSION)-$*
8585

0 commit comments

Comments
 (0)