Change master to main (#2044)

woodpecker-ci · Jul 31, 2023 · e0ed1b3 · e0ed1b3
1 parent 7efb15b
commit e0ed1b3
Show file tree

Hide file tree

Showing 48 changed files with 235 additions and 270 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -56,9 +56,9 @@ body:
       label: Validations
       description: Before submitting the issue, please make sure you do the following
       options:
-        # - label: Follow our [Code of Conduct](https://github.com/woodpecker-ci/woodpecker/blob/master/CODE_OF_CONDUCT.md)
+        # - label: Follow our [Code of Conduct](https://github.com/woodpecker-ci/woodpecker/blob/main/CODE_OF_CONDUCT.md)
         #   required: true
-        - label: Read the [Contributing Guidelines](https://github.com/woodpecker-ci/woodpecker/blob/master/CONTRIBUTING.md).
+        - label: Read the [Contributing Guidelines](https://github.com/woodpecker-ci/woodpecker/blob/main/CONTRIBUTING.md).
           required: true
         - label: Read the [docs](https://woodpecker-ci.org/docs/intro).
           required: true

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -37,11 +37,11 @@ body:
       label: Validations
       description: Before submitting the issue, please make sure you do the following
       options:
-        # - label: Follow our [Code of Conduct](https://github.com/woodpecker-ci/woodpecker/blob/master/CODE_OF_CONDUCT.md)
+        # - label: Follow our [Code of Conduct](https://github.com/woodpecker-ci/woodpecker/blob/main/CODE_OF_CONDUCT.md)
         #   required: true
         - label: Checked that the feature isn't part of the `next` version already [https://woodpecker-ci.org/faq#which-version-of-woodpecker-should-i-use]
           required: true
-        - label: Read the [Contributing Guidelines](https://github.com/woodpecker-ci/woodpecker/blob/master/CONTRIBUTING.md).
+        - label: Read the [Contributing Guidelines](https://github.com/woodpecker-ci/woodpecker/blob/main/CONTRIBUTING.md).
           required: true
         - label: Read the [docs](https://woodpecker-ci.org/docs/intro).
           required: true

diff --git a/.github/ISSUE_TEMPLATE/plugin_index.yml.disabled b/.github/ISSUE_TEMPLATE/plugin_index.yml.disabled
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
     <img src="https://ci.woodpecker-ci.org/api/badges/woodpecker-ci/woodpecker/status.svg">
   </a>
   <a href="https://codecov.io/gh/woodpecker-ci/woodpecker">
-    <img src="https://codecov.io/gh/woodpecker-ci/woodpecker/branch/master/graph/badge.svg"/>
+    <img src="https://codecov.io/gh/woodpecker-ci/woodpecker/branch/main/graph/badge.svg"/>
   </a>
   <a href="https://translate.woodpecker-ci.org/engage/woodpecker-ci/">
     <img src="https://translate.woodpecker-ci.org/widgets/woodpecker-ci/-/ui/svg-badge.svg" alt="Translation status" />

diff --git a/cli/deploy/deploy.go b/cli/deploy/deploy.go
@@ -38,7 +38,7 @@ var Command = &cli.Command{
 		&cli.StringFlag{
 			Name:  "branch",
 			Usage: "branch filter",
-			Value: "master",
+			Value: "main",
 		},
 		&cli.StringFlag{
 			Name:  "event",

diff --git a/cli/pipeline/last.go b/cli/pipeline/last.go
@@ -34,7 +34,7 @@ var pipelineLastCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "branch",
 			Usage: "branch name",
-			Value: "master",
+			Value: "main",
 		},
 	),
 }

diff --git a/docs/README.md b/docs/README.md
@@ -31,5 +31,5 @@ Deployment happen via [CI](https://github.com/woodpecker-ci/woodpecker/blob/d59f
 To manually build the website and push it exec:
 
 ```sh
-GIT_USER=woodpecker-bot USE_SSH=true DEPLOYMENT_BRANCH=master pnpm deploy
+GIT_USER=woodpecker-bot USE_SSH=true DEPLOYMENT_BRANCH=main pnpm deploy
 ```
diff --git a/docs/docs/20-usage/20-pipeline-syntax.md b/docs/docs/20-usage/20-pipeline-syntax.md
@@ -266,16 +266,16 @@ steps:
     settings:
       channel: dev
 +   when:
-+     - branch: master
++     - branch: main
 ```
 
-> The step now triggers on master, but also if the target branch of a pull request is `master`. Add an event condition to limit it further to pushes on master only.
+> The step now triggers on main branch, but also if the target branch of a pull request is `main`. Add an event condition to limit it further to pushes on main only.
 
-Execute a step if the branch is `master` or `develop`:
+Execute a step if the branch is `main` or `develop`:
 
 ```yaml
 when:
-  - branch: [master, develop]
+  - branch: [main, develop]
 ```
 
 Execute a step if the branch starts with `prefix/*`:
@@ -297,7 +297,7 @@ Execute a step using custom include and exclude logic:
 ```yaml
 when:
   - branch:
-      include: [ master, release/* ]
+      include: [ main, release/* ]
       exclude: [ release/1.0.0, release/1.1.* ]
 ```
 
@@ -765,7 +765,7 @@ Example conditional execution by branch:
 
 ```diff
 +when:
-+  branch: master
++  branch: main
 +
  steps:
    slack:
@@ -774,13 +774,13 @@ Example conditional execution by branch:
        channel: dev
 ```
 
-> The step now triggers on master, but also if the target branch of a pull request is `master`. Add an event condition to limit it further to pushes on master only.
+> The step now triggers on main, but also if the target branch of a pull request is `main`. Add an event condition to limit it further to pushes on main only.
 
-Execute a step if the branch is `master` or `develop`:
+Execute a step if the branch is `main` or `develop`:
 
 ```diff
 when:
-  branch: [master, develop]
+  branch: [main, develop]
 ```
 
 Execute a step if the branch starts with `prefix/*`:
@@ -795,7 +795,7 @@ Execute a step using custom include and exclude logic:
 ```diff
 when:
   branch:
-    include: [ master, release/* ]
+    include: [ main, release/* ]
     exclude: [ release/1.0.0, release/1.1.* ]
 ```
 

diff --git a/docs/docs/20-usage/50-environment.md b/docs/docs/20-usage/50-environment.md
@@ -57,7 +57,7 @@ This is the reference list of all environment variables available to your pipeli
 | `CI_REPO_SCM`                    | repository SCM (git)                                                                         |
 | `CI_REPO_URL`                    | repository web URL                                                                           |
 | `CI_REPO_CLONE_URL`              | repository clone URL                                                                         |
-| `CI_REPO_DEFAULT_BRANCH`         | repository default branch (master)                                                           |
+| `CI_REPO_DEFAULT_BRANCH`         | repository default branch (main)                                                           |
 | `CI_REPO_PRIVATE`                | repository is private                                                                        |
 | `CI_REPO_TRUSTED`                | repository is trusted                                                                        |
 |                                  | **Current Commit**                                                                           |

diff --git a/docs/docs/20-usage/80-badges.md b/docs/docs/20-usage/80-badges.md
@@ -8,7 +8,7 @@ Woodpecker has integrated support for repository status badges. These badges can
 <scheme>://<hostname>/api/badges/<repo-id>/status.svg
 ```
 
-The status badge displays the status for the latest build to your default branch (e.g. master). You can customize the branch by adding the `branch` query parameter.
+The status badge displays the status for the latest build to your default branch (e.g. main). You can customize the branch by adding the `branch` query parameter.
 
 ```diff
 -<scheme>://<hostname>/api/badges/<repo-id>/status.svg

diff --git a/docs/docs/30-administration/10-server-config.md b/docs/docs/30-administration/10-server-config.md
@@ -337,7 +337,7 @@ Always use authentication to clone repositories even if they are public. Needed
 List of event names that will be canceled when a new pipeline for the same context (tag, branch) is created.
 
 ### `WOODPECKER_DEFAULT_CLONE_IMAGE`
-> Default is defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/master/shared/constant/constant.go)
+> Default is defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/main/shared/constant/constant.go)
 
 The default docker image to be used when cloning the repo
 
@@ -357,7 +357,7 @@ The maximum time in minutes you can set in the repo settings before a pipeline g
 Configures the session expiration time.
 
 ### `WOODPECKER_ESCALATE`
-> Defaults are defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/master/shared/constant/constant.go)
+> Defaults are defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/main/shared/constant/constant.go)
 
 Docker images to run in privileged mode. Only change if you are sure what you do!
 

diff --git a/docs/docs/30-administration/100-external-configuration-api.md b/docs/docs/30-administration/100-external-configuration-api.md
@@ -51,7 +51,7 @@ WOODPECKER_CONFIG_SERVICE_ENDPOINT=https://example.com/ciconfig
     "author": "myUser",
     "author_avatar": "https://myforge.com/avatars/d6b3f7787a685fcdf2a44e2c685c7e03",
     "author_email": "my@email.com",
-    "branch": "master",
+    "branch": "main",
     "changed_files": [
       "somefilename.txt"
     ],
@@ -67,7 +67,7 @@ WOODPECKER_CONFIG_SERVICE_ENDPOINT=https://example.com/ciconfig
     "message": "test old config\n",
     "number": 0,
     "parent": 0,
-    "ref": "refs/heads/master",
+    "ref": "refs/heads/main",
     "refspec": "",
     "clone_url": "",
     "reviewed_at": 0,

diff --git a/docs/docs/30-administration/90-prometheus.md b/docs/docs/30-administration/90-prometheus.md
@@ -41,11 +41,11 @@ List of Prometheus metrics specific to Woodpecker:
 ```
 # HELP woodpecker_pipeline_count Pipeline count.
 # TYPE woodpecker_pipeline_count counter
-woodpecker_build_count{branch="master",pipeline="total",repo="woodpecker-ci/woodpecker",status="success"} 3
+woodpecker_build_count{branch="main",pipeline="total",repo="woodpecker-ci/woodpecker",status="success"} 3
 woodpecker_build_count{branch="mkdocs",pipeline="total",repo="woodpecker-ci/woodpecker",status="success"} 3
 # HELP woodpecker_pipeline_time Build time.
 # TYPE woodpecker_pipeline_time gauge
-woodpecker_build_time{branch="master",pipeline="total",repo="woodpecker-ci/woodpecker",status="success"} 116
+woodpecker_build_time{branch="main",pipeline="total",repo="woodpecker-ci/woodpecker",status="success"} 116
 woodpecker_build_time{branch="mkdocs",pipeline="total",repo="woodpecker-ci/woodpecker",status="success"} 155
 # HELP woodpecker_pipeline_total_count Total number of builds.
 # TYPE woodpecker_pipeline_total_count gauge

diff --git a/docs/docs/92-awesome.md b/docs/docs/92-awesome.md
@@ -2,20 +2,20 @@
 
 A curated list of awesome things related to Woodpecker-CI.
 
-If you have some missing resources, please feel free to [open a pull-request](https://github.com/woodpecker-ci/woodpecker/edit/master/docs/docs/92-awesome.md) and add them.
+If you have some missing resources, please feel free to [open a pull-request](https://github.com/woodpecker-ci/woodpecker/edit/main/docs/docs/92-awesome.md) and add them.
 
 ## Official Resources
 
-- [Woodpecker CI pipeline configs](https://github.com/woodpecker-ci/woodpecker/tree/master/.woodpecker) - Complex setup containing different kind of pipelines
-  - [Golang tests](https://github.com/woodpecker-ci/woodpecker/blob/master/.woodpecker/test.yml)
-  - [Typescript, eslint & Vue](https://github.com/woodpecker-ci/woodpecker/blob/master/.woodpecker/web.yml)
-  - [Docusaurus & publishing to GitHub Pages](https://github.com/woodpecker-ci/woodpecker/blob/master/.woodpecker/docs.yml)
-  - [Docker container building](https://github.com/woodpecker-ci/woodpecker/blob/master/.woodpecker/docker.yml)
-  - [Helm chart linting & releasing](https://github.com/woodpecker-ci/woodpecker/blob/master/.woodpecker/helm.yml)
+- [Woodpecker CI pipeline configs](https://github.com/woodpecker-ci/woodpecker/tree/main/.woodpecker) - Complex setup containing different kind of pipelines
+  - [Golang tests](https://github.com/woodpecker-ci/woodpecker/blob/main/.woodpecker/test.yml)
+  - [Typescript, eslint & Vue](https://github.com/woodpecker-ci/woodpecker/blob/main/.woodpecker/web.yml)
+  - [Docusaurus & publishing to GitHub Pages](https://github.com/woodpecker-ci/woodpecker/blob/main/.woodpecker/docs.yml)
+  - [Docker container building](https://github.com/woodpecker-ci/woodpecker/blob/main/.woodpecker/docker.yml)
+  - [Helm chart linting & releasing](https://github.com/woodpecker-ci/woodpecker/blob/main/.woodpecker/helm.yml)
 
 ## Projects using Woodpecker
 
-- [Woodpecker-CI](https://github.com/woodpecker-ci/woodpecker/tree/master/.woodpecker) itself
+- [Woodpecker-CI](https://github.com/woodpecker-ci/woodpecker/tree/main/.woodpecker) itself
 - [All official plugins](https://github.com/woodpecker-ci?q=plugin&type=all)
 - [dessalines/thumb-key](https://github.com/dessalines/thumb-key/blob/main/.woodpecker.yml) - Android Jetpack compose linting and building
 

diff --git a/docs/docs/92-development/03-ui.md b/docs/docs/92-development/03-ui.md
@@ -33,6 +33,6 @@ The following list contains some tools and frameworks used by the Woodpecker UI.
 ## Messages and Translations
 
 Woodpecker uses [Vue I18n](https://vue-i18n.intlify.dev/) as translation library.  New translations have to be added to `web/src/assets/locales/en.json`. The English source file will be automatically imported into [Weblate](https://translate.woodpecker-ci.org/) (the translation system used by Woodpecker) where all other languages will be translated by the community based on the English source.  
-You must not provide translations except English in PRs, otherwise weblate could put git into conflicts (when someone has translated in that language file and changes are not into master branch yet)
+You must not provide translations except English in PRs, otherwise weblate could put git into conflicts (when someone has translated in that language file and changes are not into main branch yet)
 
 For more information about translations see [Translations](./07-translations.md).
diff --git a/docs/docs/92-development/06-guides.md b/docs/docs/92-development/06-guides.md
@@ -36,4 +36,4 @@ To automatically execute the migration after the start of the server, the new mi
 
 ## Constants of official images
 
-All official default images, are saved in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/master/shared/constant/constant.go) and must be pinned by an exact tag.
+All official default images, are saved in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/main/shared/constant/constant.go) and must be pinned by an exact tag.
diff --git a/docs/docs/92-development/08-swagger.md b/docs/docs/92-development/08-swagger.md
@@ -47,7 +47,7 @@ These guidelines aim to have consistent wording in the swagger doc:
 * `@Param Authorization` is almost always present, there are just a few un-protected endpoints
 
 There are many examples in the server/api package, which you can use a blueprint.
-More enhanced information you can find here https://github.com/swaggo/swag/blob/master/README.md#declarative-comments-format
+More enhanced information you can find here https://github.com/swaggo/swag/blob/main/README.md#declarative-comments-format
 
 ### Manual code generation
 

diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
@@ -210,7 +210,7 @@ module.exports = {
       ({
         docs: {
           sidebarPath: require.resolve('./sidebars.js'),
-          editUrl: 'https://github.com/woodpecker-ci/woodpecker/edit/master/docs/',
+          editUrl: 'https://github.com/woodpecker-ci/woodpecker/edit/main/docs/',
           includeCurrentVersion: true,
           lastVersion: '1.0',
           versions: {

diff --git a/docs/plugins/woodpecker-plugins/plugins.json b/docs/plugins/woodpecker-plugins/plugins.json
@@ -2,7 +2,7 @@
   "plugins": [
     {
       "name": "Clone plugin",
-      "docs": "https://raw.githubusercontent.com/woodpecker-ci/plugin-git/master/docs.md",
+      "docs": "https://raw.githubusercontent.com/woodpecker-ci/plugin-git/main/docs.md",
       "verified": true
     },
     {

diff --git a/docs/plugins/woodpecker-plugins/src/theme/WoodpeckerPluginList.tsx b/docs/plugins/woodpecker-plugins/src/theme/WoodpeckerPluginList.tsx
@@ -33,16 +33,18 @@ function PluginPanel({ plugin }: { plugin: WoodpeckerPlugin }) {
 
 export function WoodpeckerPluginList({ plugins }: { plugins: WoodpeckerPlugin[] }) {
   const applyForIndexUrl =
-    'https://github.com/woodpecker-ci/woodpecker/edit/master/docs/plugins/woodpecker-plugins/plugins.json';
+    'https://github.com/woodpecker-ci/woodpecker/edit/main/docs/plugins/woodpecker-plugins/plugins.json';
 
   const [query, setQuery] = useState('');
 
-  const fuse = useRef(new Fuse(plugins, {
-    keys: ['name', 'description'],
-    threshold: 0.3,
-  }));
+  const fuse = useRef(
+    new Fuse(plugins, {
+      keys: ['name', 'description'],
+      threshold: 0.3,
+    }),
+  );
 
-  const searchedPlugins = query.length >= 1 ? fuse.current.search(query).map((p) => ( p.item )) : plugins;
+  const searchedPlugins = query.length >= 1 ? fuse.current.search(query).map((p) => p.item) : plugins;
 
   return (
     <Layout title="Woodpecker CI plugins" description="List of all Woodpecker-CI plugins">

diff --git a/pipeline/frontend/yaml/compiler/cacher.go b/pipeline/frontend/yaml/compiler/cacher.go
@@ -27,7 +27,7 @@ func (c *volumeCacher) Restore(repo, branch string, mounts []string) *yaml_types
 			"path":        "/cache",
 			"restore":     true,
 			"file":        strings.Replace(branch, "/", "_", -1) + ".tar",
-			"fallback_to": "master.tar",
+			"fallback_to": "main.tar",
 		},
 		Volumes: yaml_types.Volumes{
 			Volumes: []*yaml_types.Volume{