From 613a0cba4baa48b68c9051abc0a189d579949c7c Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 16 Aug 2021 11:23:25 -0500 Subject: [PATCH] chore: Iterate on release process --- .github/settings.yml | 6 +++++- .github/workflows/ci.yml | 7 +++++++ .github/workflows/committed.yml | 2 +- Cargo.toml | 15 ++++++++------- README.md | 1 - crates/codespell-dict/Cargo.toml | 1 - crates/dictgen/Cargo.toml | 2 +- crates/misspell-dict/Cargo.toml | 3 +-- crates/typos-dict/Cargo.toml | 3 +-- crates/typos-vars/Cargo.toml | 3 +-- crates/typos/Cargo.toml | 3 +-- crates/varcon-core/Cargo.toml | 3 +-- crates/varcon/Cargo.toml | 3 +-- crates/wikipedia-dict/Cargo.toml | 1 - release.toml | 1 + 15 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index 0a40e78..b034a62 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -37,7 +37,11 @@ labels: branches: - name: master protection: - # Manual: required_conversation_resolution: true, see https://github.com/probot/settings/issues/458 + required_pull_request_reviews: null + required_conversation_resolution: true required_status_checks: # Required. Require branches to be up to date before merging. strict: false + contexts: ["CI", "Lint Commits", "Spell Check with Typos"] + enforce_admins: false + restrictions: null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6391be..8ece17e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,13 @@ on: - '!/docs/**' - "!/LICENSE-*" jobs: + ci: + name: CI + needs: [smoke, test, msrv, docs, rustfmt, clippy] + runs-on: ubuntu-latest + steps: + - name: Done + run: exit 0 smoke: name: Quick Check runs-on: ubuntu-latest diff --git a/.github/workflows/committed.yml b/.github/workflows/committed.yml index 924241f..b6433d3 100644 --- a/.github/workflows/committed.yml +++ b/.github/workflows/committed.yml @@ -2,7 +2,7 @@ name: Lint Commits on: [pull_request] jobs: - run: + committed: name: Lint Commits runs-on: ubuntu-latest steps: diff --git a/Cargo.toml b/Cargo.toml index 0d5e6bc..627def7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,20 +13,15 @@ members = [ [package] name = "typos-cli" version = "1.1.6" -authors = ["Ed Page "] description = "Source Code Spelling Correction" +authors = ["Ed Page "] +license = "MIT OR Apache-2.0" repository = "https://github.com/crate-ci/typos" readme = "README.md" categories = ["development-tools", "text-processing"] keywords = ["development", "spelling"] -license = "MIT" edition = "2018" -[features] -default = ["dict", "vars"] -dict = ["typos-dict"] -vars = ["typos-vars"] - [package.metadata.docs.rs] no-default-features = true @@ -43,6 +38,12 @@ pre-release-replacements = [ {file="setup.py", search="TYPOS_VERSION = .*", replace="TYPOS_VERSION = '{{version}}'", exactly=1}, ] +[features] +default = ["dict", "vars"] +dict = ["typos-dict"] +vars = ["typos-vars"] + + [[bin]] name = "typos" path = "src/bin/typos-cli/main.rs" diff --git a/README.md b/README.md index 4d8f942..5f73a83 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ Finds and corrects spelling mistakes among source code: ![Screenshot](./docs/screenshot.png) -[![Build Status](https://dev.azure.com/crate-ci/crate-ci/_apis/build/status/typos?branchName=master)](https://dev.azure.com/crate-ci/crate-ci/_build/latest?definitionId=11&branchName=master) [![codecov](https://codecov.io/gh/crate-ci/typos/branch/master/graph/badge.svg)](https://codecov.io/gh/crate-ci/typos) [![Documentation](https://img.shields.io/badge/docs-master-blue.svg)][Documentation] ![License](https://img.shields.io/crates/l/typos.svg) diff --git a/crates/codespell-dict/Cargo.toml b/crates/codespell-dict/Cargo.toml index 3bd5006..f2380bc 100644 --- a/crates/codespell-dict/Cargo.toml +++ b/crates/codespell-dict/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" publish = false [badges] -azure-devops = { project = "crate-ci", pipeline = "typos" } codecov = { repository = "crate-ci/typos" } [package.metadata.release] diff --git a/crates/dictgen/Cargo.toml b/crates/dictgen/Cargo.toml index be39397..7a5e11b 100644 --- a/crates/dictgen/Cargo.toml +++ b/crates/dictgen/Cargo.toml @@ -5,7 +5,7 @@ description = "Compile-time case-insensitive map" repository = "https://github.com/crate-ci/typos" categories = ["development-tools", "text-processing"] keywords = ["development", "spelling", "no_std"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2018" [features] diff --git a/crates/misspell-dict/Cargo.toml b/crates/misspell-dict/Cargo.toml index 0f8fe02..efd294d 100644 --- a/crates/misspell-dict/Cargo.toml +++ b/crates/misspell-dict/Cargo.toml @@ -7,12 +7,11 @@ repository = "https://github.com/crate-ci/typos" readme = "README.md" categories = ["development-tools", "text-processing"] keywords = ["development", "spelling"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2018" publish = false [badges] -azure-devops = { project = "crate-ci", pipeline = "typos" } codecov = { repository = "crate-ci/typos" } [package.metadata.release] diff --git a/crates/typos-dict/Cargo.toml b/crates/typos-dict/Cargo.toml index ee8f6e5..a44804d 100644 --- a/crates/typos-dict/Cargo.toml +++ b/crates/typos-dict/Cargo.toml @@ -7,11 +7,10 @@ repository = "https://github.com/crate-ci/typos" readme = "../../README.md" categories = ["development-tools", "text-processing"] keywords = ["development", "spelling"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2018" [badges] -azure-devops = { project = "crate-ci", pipeline = "typos" } codecov = { repository = "crate-ci/typos" } [dependencies] diff --git a/crates/typos-vars/Cargo.toml b/crates/typos-vars/Cargo.toml index 9869228..0c28759 100644 --- a/crates/typos-vars/Cargo.toml +++ b/crates/typos-vars/Cargo.toml @@ -7,11 +7,10 @@ repository = "https://github.com/crate-ci/typos" readme = "../../README.md" categories = ["development-tools", "text-processing"] keywords = ["development", "spelling"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2018" [badges] -azure-devops = { project = "crate-ci", pipeline = "typos" } codecov = { repository = "crate-ci/typos" } [dependencies] diff --git a/crates/typos/Cargo.toml b/crates/typos/Cargo.toml index 322e303..4016fb8 100644 --- a/crates/typos/Cargo.toml +++ b/crates/typos/Cargo.toml @@ -7,11 +7,10 @@ repository = "https://github.com/crate-ci/typos" readme = "../../README.md" categories = ["development-tools", "text-processing"] keywords = ["development", "spelling"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2018" [badges] -azure-devops = { project = "crate-ci", pipeline = "typos" } codecov = { repository = "crate-ci/typos" } [dependencies] diff --git a/crates/varcon-core/Cargo.toml b/crates/varcon-core/Cargo.toml index 2d7cd03..309f5c1 100644 --- a/crates/varcon-core/Cargo.toml +++ b/crates/varcon-core/Cargo.toml @@ -6,11 +6,10 @@ description = "Varcon-relevant data structures" repository = "https://github.com/crate-ci/typos" readme = "../../README.md" categories = ["text-processing"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2018" [badges] -azure-devops = { project = "crate-ci", pipeline = "typos" } codecov = { repository = "crate-ci/typos" } [features] diff --git a/crates/varcon/Cargo.toml b/crates/varcon/Cargo.toml index 2f7cc43..28abac6 100644 --- a/crates/varcon/Cargo.toml +++ b/crates/varcon/Cargo.toml @@ -7,11 +7,10 @@ repository = "https://github.com/crate-ci/typos" readme = "../../README.md" categories = ["development-tools", "text-processing"] keywords = ["development", "spelling"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2018" [badges] -azure-devops = { project = "crate-ci", pipeline = "typos" } codecov = { repository = "crate-ci/typos" } [features] diff --git a/crates/wikipedia-dict/Cargo.toml b/crates/wikipedia-dict/Cargo.toml index faa01ed..4a7978f 100644 --- a/crates/wikipedia-dict/Cargo.toml +++ b/crates/wikipedia-dict/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" publish = false [badges] -azure-devops = { project = "crate-ci", pipeline = "typos" } codecov = { repository = "crate-ci/typos" } [package.metadata.release] diff --git a/release.toml b/release.toml index da33b37..9726a39 100644 --- a/release.toml +++ b/release.toml @@ -4,3 +4,4 @@ tag-message = "{{tag_name}}" tag-name = "{{prefix}}v{{version}}" consolidate-commits = true consolidate-pushes = true +allow-branch = ["master"]