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 70c8d9c commit 616a347
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docker-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ jobs:
echo -e "\u001b[32mDetected semver tag\u001b[0m"
image_tag='${{ github.event.workflow_run.head_branch }}'
push_enabled=true
elif [[ '${{ github.event.workflow_run.head_branch }}' == "master" ]]; then
echo -e "\u001b[32mDetected master branch\u001b[0m"
elif [[ '${{ github.event.workflow_run.head_branch }}' == "main" ]]; then
echo -e "\u001b[32mDetected main branch\u001b[0m"
push_enabled=true
elif [[ '${{github.ref_name}}' =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then
echo -e "\u001b[32mDetected semver tag\u001b[0m"
image_tag='${{ github.ref_name }}'
push_enabled=true
is_tagged=true
else
echo "::warning ::Unable to detect semver tag or master branch"
echo "::warning ::Unable to detect semver tag or main branch"
push_enabled=false
fi
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"

concurrency:
group: lint-${{ github.event.pull_request.number || github.ref }}
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:

concurrency:
Expand All @@ -27,13 +27,13 @@ jobs:
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
image-ref: 'docker.io/dokku/ci-docker-image:${{ github.sha }}'
format: 'template'
template: '@/contrib/sarif.tpl'
output: 'trivy-results.sarif'
severity: 'CRITICAL,HIGH'
image-ref: "docker.io/dokku/ci-docker-image:${{ 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 616a347

Please sign in to comment.