From e576c5dc7d5fa5cda494ebd98e69564e91e8faaf Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Fri, 17 Nov 2023 16:02:33 +0100 Subject: [PATCH] Rename master to main in documentation --- CONTRIBUTING.md | 8 ++++---- README.md | 6 +++--- tools/release-wizard.js | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c0a7ae3..1db5dd6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to drip aka CONDRIPUTING -So good to see you here, hello :wave\_tone1: :wave\_tone2: :wave\_tone3: :wave\_tone4: :wave\_tone5: +So good to see you here, hello :wave_tone1: :wave_tone2: :wave_tone3: :wave_tone4: :wave_tone5: ## Table Of Contents @@ -18,8 +18,8 @@ You just want to say hello? Send us a [nice email](mailto:drip@mailbox.org?Subje ## What should I know before I get started? -We have prepared something for **you**: check out our [README](https://gitlab.com/bloodyhealth/drip/blob/master/README.md) for more information on how to set up and install everything you'll need. -[Ping us](mailto:drip@mailbox.org) if you could need some help :helmet\_with\_cross: ! +We have prepared something for **you**: check out our [README](https://gitlab.com/bloodyhealth/drip/blob/main/README.md) for more information on how to set up and install everything you'll need. +[Ping us](mailto:drip@mailbox.org) if you could need some help :helmet_with_cross: ! Let us know if you want to suggest improvements for the README and open a merge request (which is just like Github's pull request) @@ -55,4 +55,4 @@ To send us a new issue you can also use our [gitlab email](mailto:incoming+blood ![](https://media.giphy.com/media/kPA88elN9kYco/giphy.gif) Thank you for condriputing to open source, thank you for condriputing to drip! -Much love from Bloody Health :heart\_exclamation: +Much love from Bloody Health :heart_exclamation: diff --git a/README.md b/README.md index fb6c8ce..c95f468 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ Find more information on [our website](https://dripapp.org/). The app is built in React Native and currently developed for Android. -▶ [How to contribute to the project](https://gitlab.com/bloodyhealth/drip/blob/master/CONTRIBUTING.md) +▶ [How to contribute to the project](https://gitlab.com/bloodyhealth/drip/blob/main/CONTRIBUTING.md) -▶ [How to release a new version](https://gitlab.com/bloodyhealth/drip/blob/master/RELEASE.md) +▶ [How to release a new version](https://gitlab.com/bloodyhealth/drip/blob/main/RELEASE.md) ## Development setup @@ -166,7 +166,7 @@ You can run the tests with: ### End to end tests -1. Check what testing device is specified in [package.json](https://gitlab.com/bloodyhealth/drip/blob/master/package.json) under: +1. Check what testing device is specified in [package.json](https://gitlab.com/bloodyhealth/drip/blob/main/package.json) under: ``` {"detox": {"configurations": diff --git a/tools/release-wizard.js b/tools/release-wizard.js index fd63c50..d864426 100644 --- a/tools/release-wizard.js +++ b/tools/release-wizard.js @@ -32,8 +32,8 @@ async function leadThroughRelease() { await makeCommitRelease() console.log(`Groovy. We've created a commit for this release that includes the version and changelog updates, as well as a git tag for the release. -Please review it, make any necessary changes, and if it's all good, push the commit and the tag up to master by running: -git push origin master +Please review it, make any necessary changes, and if it's all good, push the commit and the tag up to 'your-branch' by running: +git push origin 'your-branch' git push origin ${require('../package.json').version} Don't forget to also run 'npm run build-android-release' to package the apk and upload it to the app stores!