Skip to content

Commit 34e5dc7

Browse files
authored
Merge pull request #1149 from fluxcd/ci-release-workflows
ci: various workflow changes
2 parents f2857e6 + f402e21 commit 34e5dc7

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

.github/workflows/cifuzz.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: fuzz
22
on:
33
pull_request:
44
branches:
5-
- main
5+
- 'main'
6+
- 'release/**'
67
paths-ignore:
78
- 'CHANGELOG.md'
89
- 'README.md'

.github/workflows/e2e.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ on:
88
- 'MAINTAINERS'
99
push:
1010
branches:
11-
- main
11+
- 'main'
12+
- 'release/**'
1213

1314
permissions:
1415
contents: read # for actions/checkout to fetch code
@@ -28,8 +29,8 @@ jobs:
2829
**/go.sum
2930
**/go.mod
3031
- name: Enable integration tests
31-
# Only run integration tests for main branch
32-
if: github.ref == 'refs/heads/main'
32+
# Only run integration tests for main and release branches
33+
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')
3334
run: |
3435
echo 'GO_TAGS=integration' >> $GITHUB_ENV
3536
- name: Setup Kubernetes
@@ -63,8 +64,8 @@ jobs:
6364
**/go.sum
6465
**/go.mod
6566
- name: Enable integration tests
66-
# Only run integration tests for main branch
67-
if: github.ref == 'refs/heads/main'
67+
# Only run integration tests for main and release branches
68+
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')
6869
run: |
6970
echo 'GO_TAGS=integration' >> $GITHUB_ENV
7071
- name: Prepare

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
inputs:
88
tag:
99
description: 'image tag prefix'
10-
default: 'rc'
10+
default: 'preview'
1111
required: true
1212

1313
permissions:

.github/workflows/scan.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: scan
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [ 'main', 'release/**' ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ 'main', 'release/**' ]
88
schedule:
99
- cron: '18 10 * * 3'
1010

.github/workflows/tests.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ on:
99

1010
push:
1111
branches:
12-
- main
12+
- 'main'
13+
- 'release/**'
1314

1415
permissions:
1516
contents: read # for actions/checkout to fetch code

.github/workflows/verify.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ on:
99

1010
push:
1111
branches:
12-
- main
12+
- 'main'
13+
- 'release/**'
1314

1415
permissions:
1516
contents: read # for actions/checkout to fetch code

0 commit comments

Comments
 (0)