Skip to content

Commit

Permalink
Merge pull request #1149 from fluxcd/ci-release-workflows
Browse files Browse the repository at this point in the history
ci: various workflow changes
  • Loading branch information
hiddeco authored Jul 3, 2023
2 parents f2857e6 + f402e21 commit 34e5dc7
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/cifuzz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: fuzz
on:
pull_request:
branches:
- main
- 'main'
- 'release/**'
paths-ignore:
- 'CHANGELOG.md'
- 'README.md'
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
- 'MAINTAINERS'
push:
branches:
- main
- 'main'
- 'release/**'

permissions:
contents: read # for actions/checkout to fetch code
Expand All @@ -28,8 +29,8 @@ jobs:
**/go.sum
**/go.mod
- name: Enable integration tests
# Only run integration tests for main branch
if: github.ref == 'refs/heads/main'
# Only run integration tests for main and release branches
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')
run: |
echo 'GO_TAGS=integration' >> $GITHUB_ENV
- name: Setup Kubernetes
Expand Down Expand Up @@ -63,8 +64,8 @@ jobs:
**/go.sum
**/go.mod
- name: Enable integration tests
# Only run integration tests for main branch
if: github.ref == 'refs/heads/main'
# Only run integration tests for main and release branches
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')
run: |
echo 'GO_TAGS=integration' >> $GITHUB_ENV
- name: Prepare
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
inputs:
tag:
description: 'image tag prefix'
default: 'rc'
default: 'preview'
required: true

permissions:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: scan

on:
push:
branches: [ main ]
branches: [ 'main', 'release/**' ]
pull_request:
branches: [ main ]
branches: [ 'main', 'release/**' ]
schedule:
- cron: '18 10 * * 3'

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ on:

push:
branches:
- main
- 'main'
- 'release/**'

permissions:
contents: read # for actions/checkout to fetch code
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ on:

push:
branches:
- main
- 'main'
- 'release/**'

permissions:
contents: read # for actions/checkout to fetch code
Expand Down

0 comments on commit 34e5dc7

Please sign in to comment.