From 4b73d01c2eadd58675f09872a97814d3a2da79a4 Mon Sep 17 00:00:00 2001 From: thc202 Date: Thu, 21 Sep 2023 19:50:53 +0100 Subject: [PATCH] Update website's default branch Change the default branch to main. Signed-off-by: thc202 --- .github/workflows/alert-docs.yml | 2 +- .github/workflows/event-docs.yml | 2 +- build.gradle.kts | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/alert-docs.yml b/.github/workflows/alert-docs.yml index 20a1c379..49fbb33f 100644 --- 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:$GITHUB_TOKEN@github.com/$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 \ No newline at end of file diff --git a/.github/workflows/event-docs.yml b/.github/workflows/event-docs.yml index 939f28f3..7e78b337 100644 --- 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 index 3b9f3963..527c6572 100644 --- 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")