diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index a0805f1e..c4cdc84f 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -3,7 +3,7 @@ on: pull_request: push: branches: - - master + - main paths-ignore: - '**.md' diff --git a/README.md b/README.md index b16058a2..4a25aa22 100644 --- a/README.md +++ b/README.md @@ -116,14 +116,14 @@ These are some of the open-source projects using (or used) **Android Emulator Ru - [coil-kt/coil](https://github.com/coil-kt/coil/blob/master/.github/workflows/) - [cashapp/sqldelight](https://github.com/cashapp/sqldelight/blob/master/.github/workflows/) -- [square/workflow](https://github.com/square/workflow/blob/master/.github/workflows/) +- [square/workflow](https://github.com/square/workflow/blob/main/.github/workflows/) - [square/retrofit](https://github.com/square/retrofit/blob/master/.github/workflows/) - [natario1/CameraView](https://github.com/natario1/CameraView/tree/master/.github/workflows) - [natario1/Transcoder](https://github.com/natario1/Transcoder/tree/master/.github/workflows) -- [chrisbanes/insetter](https://github.com/chrisbanes/insetter/tree/master/.github/workflows) -- [slackhq/keeper](https://github.com/slackhq/keeper/tree/master/.github/workflows) +- [chrisbanes/insetter](https://github.com/chrisbanes/insetter/tree/main/.github/workflows) +- [slackhq/keeper](https://github.com/slackhq/keeper/tree/main/.github/workflows) - [android/compose-samples](https://github.com/android/compose-samples/blob/master/.github/workflows/ci.yaml) -- [ReactiveCircus/streamlined](https://github.com/ReactiveCircus/streamlined/tree/master/.github/workflows) +- [ReactiveCircus/streamlined](https://github.com/ReactiveCircus/streamlined/tree/main/.github/workflows) - [ReactiveCircus/FlowBinding](https://github.com/ReactiveCircus/FlowBinding) - [vinaygaba/Learn-Jetpack-Compose-By-Example](https://github.com/vinaygaba/Learn-Jetpack-Compose-By-Example/) - [ashishb/adb-enhanced](https://github.com/ashishb/adb-enhanced/tree/master/.github/workflows) diff --git a/RELEASING.md b/RELEASING.md index a7bcaeff..8bc80e27 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -4,7 +4,7 @@ Refer to the [recommendeations for versioning and releasing actions](https://git ## New major release -- From `master` branch, run `npm run build && npm test --clean && npm run lint` to make sure `lib/*.js` are up-to-date. +- From `main` branch, run `npm run build && npm test --clean && npm run lint` to make sure `lib/*.js` are up-to-date. - Update `CHANGELOG.md`, push change with "Prepare for release X.Y.Z." (where X.Y.Z is the new version). - Create a new branch e.g. `release/v1`, comment out `node_modules/` in `.gitignore`, commit the change (do not commit yet `node_modules`). - Run `npm prune --production`. @@ -17,9 +17,9 @@ Refer to the [recommendeations for versioning and releasing actions](https://git ## New minor / patch release -- From `master` branch, run `npm run build && npm test --clean && npm run lint` to make sure `lib/*.js` are up-to-date. +- From `main` branch, run `npm run build && npm test --clean && npm run lint` to make sure `lib/*.js` are up-to-date. - Update `CHANGELOG.md`, push change with "Prepare for release X.Y.Z." (where X.Y.Z is the new version). -- Merge from `master` into the release branch e.g. `release/v1`. +- Merge from `main` into the release branch e.g. `release/v1`. - Run `npm prune --production`. - Commit merged changes (and the pruned `node_modules`). - Push to remote.