Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update master to main #88

Merged
merged 1 commit into from
Nov 12, 2023
Merged

Update master to main #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Continuous Integration
"on":
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
schedule:
- cron: 38 11 * * 6
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: coverage

on:
push:
branches: [master]
branches: [main]

jobs:
tarpaulin:
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions update_www.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions xtask/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down