Merge pull request #114 from dokku/switch-to-main

feat: switch default branch to main
dokku · Sep 14, 2024 · 54821ca · 54821ca
2 parents 70c8d9c + 616a347
commit 54821ca
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml
@@ -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
 

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -8,7 +8,7 @@ on:
       - "*"
   push:
     branches:
-      - "master"
+      - "main"
 
 concurrency:
   group: lint-${{ github.event.pull_request.number || github.ref }}

diff --git a/.github/workflows/trivy-analysis.yaml b/.github/workflows/trivy-analysis.yaml
@@ -5,7 +5,7 @@ name: trivy-analysis
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 concurrency:
@@ -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"