Merge pull request #1020 from thc202/website-default-branch

Update website's default branch
zaproxy · Sep 28, 2023 · f7991b5 · f7991b5
2 parents 6e8d631 + 4b73d01
commit f7991b5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/alert-docs.yml b/.github/workflows/alert-docs.yml
@@ -39,5 +39,5 @@ jobs:
           git remote set-url origin https://$GITHUB_USER:[email protected]/$GITHUB_USER/zaproxy-website.git
           git commit -m "Update alert pages" --signoff
           git push --set-upstream origin update-alerts --force
-          hub pull-request -b zaproxy:master --no-edit
+          hub pull-request -b zaproxy:main --no-edit
         fi
diff --git a/.github/workflows/event-docs.yml b/.github/workflows/event-docs.yml
@@ -36,4 +36,4 @@ jobs:
         git add site/data/events.yaml
         git commit -m "Update events page" --signoff
         git push --set-upstream origin update-events --force
-        hub pull-request -b zaproxy:master --no-edit
+        hub pull-request -b zaproxy:main --no-edit
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -325,6 +325,7 @@ val updateWebsite by tasks.registering(CreatePullRequest::class) {
 
     user.set(ghUser)
     repo.set(websiteRepo)
+    baseBranchName.set("main")
     branchName.set("update-data")
 
     commitSummary.set("Update data")