From 242d91f0992a9d5cffdab79bada5c31f0ade2f8e Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 24 May 2021 13:25:31 +0200 Subject: [PATCH] chore: replace master by main as default branch BREAKING CHANGE: We have switched to 'main' as default branch. The 'master' branch is no longer maintained and will be removed after June 30, 2021! --- .drone.yml | 14 +++++++------- .github/settings.yml | 4 ++-- README.md | 12 ++++++------ exampleSite/content/posts/getting-started.md | 4 ++-- theme.toml | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 72eca29..0617938 100644 --- a/.drone.yml +++ b/.drone.yml @@ -73,7 +73,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -131,7 +131,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -173,10 +173,10 @@ steps: - curl -sSL https://github.com/thegeeklab/hugo-geekblog/releases/latest/download/hugo-geekblog.tar.gz | tar -xz -C exampleSite/themes/hugo-geekblog/ --strip-components=1 when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** -- name: assets-master +- name: assets-main image: node:lts commands: - npm install > /dev/null @@ -220,12 +220,12 @@ steps: target: /${DRONE_REPO_NAME} when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -260,7 +260,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** status: - success diff --git a/.github/settings.yml b/.github/settings.yml index ca95189..0a9e213 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -11,7 +11,7 @@ repository: has_wiki: false has_downloads: false - default_branch: master + default_branch: main allow_squash_merge: true allow_merge_commit: true @@ -47,7 +47,7 @@ labels: description: This will not be worked on branches: - - name: master + - name: main protection: required_status_checks: strict: true diff --git a/README.md b/README.md index d399107..7ef3bd8 100644 --- a/README.md +++ b/README.md @@ -4,17 +4,17 @@ [![Hugo Version](https://img.shields.io/badge/hugo-0.65-blue.svg)](https://gohugo.io) [![GitHub release](https://img.shields.io/github/v/release/thegeeklab/hugo-geekblog)](https://github.com/thegeeklab/hugo-geekblog/releases/latest) [![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/hugo-geekblog)](https://github.com/thegeeklab/hugo-geekblog/graphs/contributors) -[![License: MIT](https://img.shields.io/github/license/thegeeklab/hugo-geekblog)](https://github.com/thegeeklab/hugo-geekblog/blob/master/LICENSE) +[![License: MIT](https://img.shields.io/github/license/thegeeklab/hugo-geekblog)](https://github.com/thegeeklab/hugo-geekblog/blob/main/LICENSE) Geekblog is a simple Hugo theme for personal blogs. It is intentionally designed as a fast and lean theme and may not fit the requirements of complex websites. If a more feature-complete theme is required there are a lot of got alternatives out there. You can find a demo and the full documentation at [https://hugo-geekblog.geekdocs.de](https://hugo-geekblog.geekdocs.de). -![Desktop and mobile preview](https://github.com/thegeeklab/hugo-geekblog/blob/master/images/readme.png) +![Desktop and mobile preview](https://github.com/thegeeklab/hugo-geekblog/blob/main/images/readme.png) ## Build and release process This theme is subject to a CI driven build and release process common for software development. During the release build, all necessary assets are automatically built by [gulp](https://gulpjs.com/) and bundled in a release tarball. You can download the latest release from the GitHub [release page](https://github.com/thegeeklab/hugo-geekblog/releases). -Due to the fact that `gulp` is used as pre-processor the theme cannot be used from the master branch by default. If you want to use the theme from a cloned branch instead of a release tarball you'll need to install `gulp` locally and run the default pipeline once to create all required assets. +Due to the fact that `gulp` is used as pre-processor the theme cannot be used from the main branch by default. If you want to use the theme from a cloned branch instead of a release tarball you'll need to install `gulp` locally and run the default pipeline once to create all required assets. ```Shell # install required packages from package.json @@ -29,14 +29,14 @@ See the [Getting Started Guide](https://hugo-geekblog.geekdocs.de/posts/getting- ## Contributors Special thanks goes to all [contributors](https://github.com/thegeeklab/hugo-geekblog/graphs/contributors). If you would like to contribute, -please see the [instructions](https://github.com/thegeeklab/hugo-geekblog/blob/master/CONTRIBUTING.md). +please see the [instructions](https://github.com/thegeeklab/hugo-geekblog/blob/main/CONTRIBUTING.md). ## License -This project is licensed under the MIT License - see the [LICENSE](https://github.com/thegeeklab/hugo-geekblog/blob/master/LICENSE) file for details. +This project is licensed under the MIT License - see the [LICENSE](https://github.com/thegeeklab/hugo-geekblog/blob/main/LICENSE) file for details. The used SVG icons and generated icon fonts are licensed under the license of the respective icon pack: - Font Awesome: [CC BY 4.0 License](https://github.com/FortAwesome/Font-Awesome#license) - IcoMoon Free Pack: [GPL/CC BY 4.0](https://icomoon.io/#icons-icomoon) -- Material Icons: [Apache License 2.0](https://github.com/google/material-design-icons/blob/master/LICENSE) +- Material Icons: [Apache License 2.0](https://github.com/google/material-design-icons/blob/main/LICENSE) diff --git a/exampleSite/content/posts/getting-started.md b/exampleSite/content/posts/getting-started.md index 85d3db6..44a17ab 100644 --- a/exampleSite/content/posts/getting-started.md +++ b/exampleSite/content/posts/getting-started.md @@ -16,7 +16,7 @@ Geekblog is a simple Hugo theme for personal blogs. It is intentionally designed [![Hugo Version](https://img.shields.io/badge/hugo-0.65-blue.svg)](https://gohugo.io) [![GitHub release](https://img.shields.io/github/v/release/thegeeklab/hugo-geekblog)](https://github.com/thegeeklab/hugo-geekblog/releases/latest) [![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/hugo-geekblog)](https://github.com/thegeeklab/hugo-geekblog/graphs/contributors) -[![License: MIT](https://img.shields.io/github/license/thegeeklab/hugo-geekblog)](https://github.com/thegeeklab/hugo-geekblog/blob/master/LICENSE) +[![License: MIT](https://img.shields.io/github/license/thegeeklab/hugo-geekblog)](https://github.com/thegeeklab/hugo-geekblog/blob/main/LICENSE) @@ -126,7 +126,7 @@ To prepare your new site environment just a few steps are required: If you want to add some demo data you could use the content from the [Hugo basic example](https://github.com/gohugoio/hugoBasicExample): ```Shell - curl -L https://github.com/gohugoio/hugoBasicExample/archive/master.tar.gz | tar -xz --exclude "config*" --exclude "LICENSE" --exclude "README*" --strip-components=1 + curl -L https://github.com/gohugoio/hugoBasicExample/archive/main.tar.gz | tar -xz --exclude "config*" --exclude "LICENSE" --exclude "README*" --strip-components=1 ``` ### Option 1: Download pre-build release bundle diff --git a/theme.toml b/theme.toml index 6135744..5586234 100644 --- a/theme.toml +++ b/theme.toml @@ -1,6 +1,6 @@ name = "Geekblog" license = "MIT" -licenselink = "https://github.com/thegeeklab/hugo-geekblog/blob/master/LICENSE" +licenselink = "https://github.com/thegeeklab/hugo-geekblog/blob/main/LICENSE" description = "Hugo theme made for blogs" homepage = "https://hugo-geekblog.geekdocs.de/" tags = ["blog", "responsive", "simple"]