diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 348976a2c..f4a825a48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - '*' + - scf_master tags: - '*' pull_request: diff --git a/.npmignore b/.npmignore index a7200da24..c991d8a51 100644 --- a/.npmignore +++ b/.npmignore @@ -40,8 +40,6 @@ testem.* /.idea /config/release.js /fastboot-tests -yuidoc.json -gulpfile.js .codeclimate.yml /node-tests /DEBUG diff --git a/RELEASE.md b/RELEASE.md index 55e91ed6e..8f0cdd633 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,60 +1,6 @@ # Release Process -Releases are mostly automated using -[release-it](https://github.com/release-it/release-it/) and -[lerna-changelog](https://github.com/lerna/lerna-changelog/). +Releases are made by hand. release-it and lerna-changelog are no longer used. -## Preparation - -Since the majority of the actual release process is automated, the primary -remaining task prior to releasing is confirming that all pull requests that -have been merged since the last release have been labeled with the appropriate -`lerna-changelog` labels and the titles have been updated to ensure they -represent something that would make sense to our users. Some great information -on why this is important can be found at -[keepachangelog.com](https://keepachangelog.com/en/1.0.0/), but the overall -guiding principle here is that changelogs are for humans, not machines. - -When reviewing merged PR's the labels to be used are: - -* breaking - Used when the PR is considered a breaking change. -* enhancement - Used when the PR adds a new feature or enhancement. -* bug - Used when the PR fixes a bug included in a previous release. -* documentation - Used when the PR adds or updates documentation. -* internal - Used for internal changes that still require a mention in the - changelog/release notes. - -## Release - -Once the prep work is completed, the actual release is straight forward: - -* First, ensure that you have installed your projects dependencies: - -```sh -yarn install -``` - -* Second, ensure that you have obtained a - [GitHub personal access token][generate-token] with the `repo` scope (no - other permissions are needed). Make sure the token is available as the - `GITHUB_AUTH` environment variable. - - For instance: - - ```bash - export GITHUB_AUTH=abc123def456 - ``` - -[generate-token]: https://github.com/settings/tokens/new?scopes=repo&description=GITHUB_AUTH+env+variable - -* And last (but not least 😁) do your release. - -```sh -npx release-it -``` - -[release-it](https://github.com/release-it/release-it/) manages the actual -release process. It will prompt you to to choose the version number after which -you will have the chance to hand tweak the changelog to be used (for the -`CHANGELOG.md` and GitHub release), then `release-it` continues on to tagging, -pushing the tag and commits, etc. +To release, bump `version` in `package.json` in its own commit (titled +"bump version") once the changes it ships are merged. diff --git a/addon/components/bs-alert.hbs b/addon/components/bs-alert.hbs index e192d07fb..ed8b27fbb 100644 --- a/addon/components/bs-alert.hbs +++ b/addon/components/bs-alert.hbs @@ -1,8 +1,7 @@