Skip to content

Commit

Permalink
feat: switch default branch to main
Browse files Browse the repository at this point in the history
Due to local tooling updates, all the other Dokku repositories are converging on 'main' as the default. This makes my local workflows for interacting with this repository annoying as I need to remember if the repo uses main or master. As such, the default branch is moving to main to reduce cognitive overhead while I maintain the repository.
  • Loading branch information
josegonzalez committed Sep 14, 2024
1 parent 4d6e4b1 commit cb3b55d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ name: build
on:
pull_request:
branches:
- '*'
- "*"
push:
branches:
- 'master'
- "main"

jobs:
docker:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- "*"
push:
branches:
- "master"
- "main"

jobs:
hadolint:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/trivy-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: trivy-analysis
on:
push:
branches:
- master
- "main"
pull_request:

jobs:
Expand All @@ -23,13 +23,13 @@ jobs:
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
image-ref: 'docker.io/dokku/ambassador:${{ github.sha }}'
format: 'template'
template: '@/contrib/sarif.tpl'
output: 'trivy-results.sarif'
severity: 'CRITICAL,HIGH'
image-ref: "docker.io/dokku/ambassador:${{ github.sha }}"
format: "template"
template: "@/contrib/sarif.tpl"
output: "trivy-results.sarif"
severity: "CRITICAL,HIGH"

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'trivy-results.sarif'
sarif_file: "trivy-results.sarif"

0 comments on commit cb3b55d

Please sign in to comment.