From f80572213d85278ca4366a339471a2e33b3b69f7 Mon Sep 17 00:00:00 2001 From: Roy Lenferink Date: Mon, 24 May 2021 19:14:15 +0200 Subject: [PATCH] Follow-up actions on changing the default branch --- Jenkinsfile | 2 +- README.md | 2 +- config.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2cd3386..a6c41ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -64,7 +64,7 @@ pipeline { stage('Deploy') { when { anyOf { - branch 'master' + branch 'main' } } steps { diff --git a/README.md b/README.md index c702cbc..63c4de3 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The repository for the main Community Development website is at https://github.c ## How to publish the website -Changes to the `master` branch of this repository trigger the [events-site Jenkins Job](https://ci-builds.apache.org/job/Community%20Development/job/events-site/job/master/), which generates the website content and commits it to the `asf-site` branch of this repository. There's currently (April 2020) a lag of about ten minutes for the Jenkins job to start, if you commit directly to the GitHub repository. +Changes to the `main` branch of this repository trigger the [events-site Jenkins Job](https://ci-builds.apache.org/job/Community%20Development/job/events-site/job/main/), which generates the website content and commits it to the `asf-site` branch of this repository. There's currently (April 2020) a lag of about ten minutes for the Jenkins job to start, if you commit directly to the GitHub repository. The [ASF's gitpubsub mechanism](https://blogs.apache.org/infra/entry/git_based_websites_available) then synchronizes that content to [https://events.apache.org/](https://events.apache.org/), usually within a few seconds. More details about the publication process can be found in the [ASF Documentation about Project sites](https://infra.apache.org/project-site.html). If for some reason this process fails, you can use [the self-service page from ASF Infra](https://selfserve.apache.org/) to trigger a resync of the git repo. diff --git a/config.toml b/config.toml index 2abce53..a200af7 100644 --- a/config.toml +++ b/config.toml @@ -34,4 +34,4 @@ date = ["date", ":filename", "publishDate", "lastmod"] [params] repositoryUrl = "https://github.com/apache/comdev-events-site" -repositorySourceBranch = "master" +repositorySourceBranch = "main"