Follow-up actions on changing the default branch main
authorRoy Lenferink <lenferinkroy@gmail.com>
Mon, 24 May 2021 17:14:15 +0000 (19:14 +0200)
committerRoy Lenferink <lenferinkroy@gmail.com>
Mon, 24 May 2021 17:14:15 +0000 (19:14 +0200)
Jenkinsfile
README.md
config.toml

index 2cd33868243643213d755259ab16662c16c43716..a6c41ba17d4e950c579b3f4776dadca7c3e9ab51 100644 (file)
@@ -64,7 +64,7 @@ pipeline {
         stage('Deploy') {
             when {
                 anyOf {
-                    branch 'master'
+                    branch 'main'
                 }
             }
             steps {
index c702cbcb46d36c53e6e65b443eb74c34c5ad35d8..63c4de3f785b87fd7604a5d498c3b52e446db1da 100644 (file)
--- 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.
 
index 2abce535f285d9a8c63238ca24055cb47f0d79d7..a200af79c057959e326fd7518f34ac4819585bfa 100644 (file)
@@ -34,4 +34,4 @@ date = ["date", ":filename", "publishDate", "lastmod"]
 
 [params]
 repositoryUrl = "https://github.com/apache/comdev-events-site"
-repositorySourceBranch = "master"
+repositorySourceBranch = "main"