Skip to content

Commit ac54f59

Browse files
committed
move extra steps to pre-merge
1 parent 1325267 commit ac54f59

File tree

2 files changed

+34
-33
lines changed

2 files changed

+34
-33
lines changed

.github/workflows/post-merge.yml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,3 @@ jobs:
3030
run_helm_build: true
3131
run_helm_push: true
3232
secrets: inherit
33-
34-
lint:
35-
runs-on: ubuntu-latest
36-
steps:
37-
- name: Checkout PR
38-
uses: actions/checkout@v4
39-
with:
40-
ref: ${{ github.head_ref }}
41-
42-
- name: Lint code
43-
run: make lint
44-
45-
build:
46-
runs-on: ubuntu-latest
47-
steps:
48-
- name: Checkout PR
49-
uses: actions/checkout@v4
50-
with:
51-
ref: ${{ github.head_ref }}
52-
53-
- name: Build code
54-
run: make build
55-
56-
test:
57-
runs-on: ubuntu-latest
58-
steps:
59-
- name: Checkout PR
60-
uses: actions/checkout@v4
61-
with:
62-
ref: ${{ github.head_ref }}
63-
64-
- name: Test code
65-
run: make test

.github/workflows/pre-merge.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,37 @@ jobs:
2828
run_docker_build: true
2929
run_scan_containers: false
3030
secrets: inherit
31+
32+
lint:
33+
runs-on: ubuntu-latest
34+
steps:
35+
- name: Checkout PR
36+
uses: actions/checkout@v4
37+
with:
38+
ref: ${{ github.head_ref }}
39+
40+
- name: Lint code
41+
run: make lint
42+
43+
build:
44+
runs-on: ubuntu-latest
45+
steps:
46+
- name: Checkout PR
47+
uses: actions/checkout@v4
48+
with:
49+
ref: ${{ github.head_ref }}
50+
51+
- name: Build code
52+
run: make build
53+
54+
test:
55+
runs-on: ubuntu-latest
56+
steps:
57+
- name: Checkout PR
58+
uses: actions/checkout@v4
59+
with:
60+
ref: ${{ github.head_ref }}
61+
62+
- name: Test code
63+
run: make test
64+

0 commit comments

Comments
 (0)