From 8f58457cb6bacdb1e8bbe11a2431d05459ace7dd Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 13 Sep 2024 21:47:17 -0400 Subject: [PATCH] feat: switch default branch to main 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. --- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 12 ++++++------ .github/workflows/trivy-analysis.yml | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 494b705..0f40e9a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: - "*" push: branches: - - "master" + - "main" jobs: docker: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ebdd3d1..187084a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,14 +1,14 @@ --- -name: 'lint' +name: "lint" # yamllint disable-line rule:truthy on: pull_request: branches: - - '*' + - "*" push: branches: - - 'master' + - "main" jobs: hadolint: @@ -31,8 +31,8 @@ jobs: uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb # v1.5.0 => 04d43ee9191307b50935a753da3b775ab695eceb with: - config: '.github/linters/.markdown-lint.yml' - args: './README.md' + config: ".github/linters/.markdown-lint.yml" + args: "./README.md" shellcheck: name: shellcheck @@ -71,4 +71,4 @@ jobs: uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c # v3.0.2 => c19bd0523a9011c3a3960fe6640a0882b59af15d with: - config_file: '.github/linters/.yamllint.yml' + config_file: ".github/linters/.yamllint.yml" diff --git a/.github/workflows/trivy-analysis.yml b/.github/workflows/trivy-analysis.yml index a840c1f..39d16b1 100644 --- a/.github/workflows/trivy-analysis.yml +++ b/.github/workflows/trivy-analysis.yml @@ -5,7 +5,7 @@ name: trivy-analysis on: push: branches: - - master + - main pull_request: jobs: @@ -23,13 +23,13 @@ jobs: - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master with: - image-ref: 'docker.io/dokku/s3backup:${{ github.sha }}' - format: 'template' - template: '@/contrib/sarif.tpl' - output: 'trivy-results.sarif' - severity: 'CRITICAL,HIGH' + image-ref: "docker.io/dokku/s3backup:${{ 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"