Update master to main (#88)

ia0 · Nov 12, 2023 · 61bc9bf · 61bc9bf
1 parent d137ca1
commit 61bc9bf
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,10 +3,10 @@ name: Continuous Integration
 "on":
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
   schedule:
     - cron: 38 11 * * 6
 jobs:

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -2,7 +2,7 @@ name: coverage
 
 on:
   push:
-    branches: [master]
+    branches: [main]
 
 jobs:
   tarpaulin:

diff --git a/README.md b/README.md
@@ -18,12 +18,12 @@ This repository provides the following Rust crates for data-encoding:
 [binary]: https://crates.io/crates/data-encoding-bin
 [ci]: https://github.com/ia0/data-encoding/actions/workflows/ci.yml
 [ci_badge]: https://github.com/ia0/data-encoding/actions/workflows/ci.yml/badge.svg
-[coveralls]: https://coveralls.io/github/ia0/data-encoding?branch=master
-[coveralls_badge]: https://coveralls.io/repos/github/ia0/data-encoding/badge.svg?branch=master
+[coveralls]: https://coveralls.io/github/ia0/data-encoding?branch=main
+[coveralls_badge]: https://coveralls.io/repos/github/ia0/data-encoding/badge.svg?branch=main
 [documentation]: https://docs.rs/data-encoding
 [documentation_badge]: https://docs.rs/data-encoding/badge.svg
 [library]: https://crates.io/crates/data-encoding
-[license]: https://github.com/ia0/data-encoding/blob/master/LICENSE
+[license]: https://github.com/ia0/data-encoding/blob/main/LICENSE
 [license_badge]: https://img.shields.io/crates/l/data-encoding.svg
 [macro]: https://docs.rs/data-encoding-macro
 [version_badge]: https://img.shields.io/crates/v/data-encoding.svg

diff --git a/lib/README.md b/lib/README.md
@@ -29,6 +29,6 @@ See the [documentation] for more details.
 
 [ci]: https://github.com/ia0/data-encoding/actions/workflows/ci.yml
 [ci_badge]: https://github.com/ia0/data-encoding/actions/workflows/ci.yml/badge.svg
-[coveralls]: https://coveralls.io/github/ia0/data-encoding?branch=master
-[coveralls_badge]: https://coveralls.io/repos/github/ia0/data-encoding/badge.svg?branch=master
+[coveralls]: https://coveralls.io/github/ia0/data-encoding?branch=main
+[coveralls_badge]: https://coveralls.io/repos/github/ia0/data-encoding/badge.svg?branch=main
 [documentation]: https://docs.rs/data-encoding
diff --git a/update_www.sh b/update_www.sh
@@ -9,8 +9,8 @@ CUR_STATUS="$(git status --porcelain)"
 [ -z "$CUR_STATUS" ] || fail "Working directory is dirty."
 
 CUR_BRANCH="$(git symbolic-ref -q HEAD)"
-[ "$CUR_BRANCH" = refs/heads/master ] ||
-fail "Current branch is not master"
+[ "$CUR_BRANCH" = refs/heads/main ] ||
+fail "Current branch is not main"
 
 CUR_COMMIT="$(git rev-parse -q --verify HEAD)"
 DOC_BRANCH=gh-pages
@@ -24,4 +24,4 @@ rm -r www
 echo -n 'data-encoding.rs' > CNAME
 git add .
 git commit -qm"$CUR_COMMIT"
-git checkout -q master
+git checkout -q main
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -374,8 +374,8 @@ impl Flags {
                 let mut ci = Workflow {
                     name: "Continuous Integration".to_owned(),
                     on: WorkflowOn {
-                        push: WorkflowEvents { branches: vec!["master".to_owned()] },
-                        pull_request: WorkflowEvents { branches: vec!["master".to_owned()] },
+                        push: WorkflowEvents { branches: vec!["main".to_owned()] },
+                        pull_request: WorkflowEvents { branches: vec!["main".to_owned()] },
                         schedule: vec![WorkflowSchedule { cron: "38 11 * * 6".to_owned() }],
                     },
                     jobs: BTreeMap::new(),