Prepare for branch move: development -> main

This commit is contained in:
Scott Nonnenberg 2022-04-25 15:53:31 -07:00 committed by GitHub
parent decf65078c
commit 9921a07a0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 7 deletions

View file

@ -16,7 +16,7 @@ contact_links:
url: https://community.signalusers.org/c/support/ url: https://community.signalusers.org/c/support/
about: Feel free to ask anything about: Feel free to ask anything
- name: 📖 Contribution instructions - name: 📖 Contribution instructions
url: https://github.com/signalapp/Signal-Desktop/blob/development/CONTRIBUTING.md url: https://github.com/signalapp/Signal-Desktop/blob/main/CONTRIBUTING.md
about: Want to contribute to Signal Desktop? Start here. about: Want to contribute to Signal Desktop? Start here.
- name: ❓ Other issue? - name: ❓ Other issue?
url: https://community.signalusers.org/ url: https://community.signalusers.org/

View file

@ -16,7 +16,7 @@ Remember, you can preview this before saving it.
- [ ] My contribution is **not** related to translations. _Please submit translation changes via our [Signal Desktop Transifex project](https://www.transifex.com/signalapp/signal-desktop/)._ - [ ] My contribution is **not** related to translations. _Please submit translation changes via our [Signal Desktop Transifex project](https://www.transifex.com/signalapp/signal-desktop/)._
- [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/) - [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/)
- [ ] My changes are [rebased](https://medium.com/free-code-camp/git-rebase-and-the-golden-rule-explained-70715eccc372) on the latest [`development`](https://github.com/signalapp/Signal-Desktop/tree/development) branch - [ ] My changes are [rebased](https://medium.com/free-code-camp/git-rebase-and-the-golden-rule-explained-70715eccc372) on the latest [`main`](https://github.com/signalapp/Signal-Desktop/tree/main) branch
- [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/signalapp/Signal-Desktop/blob/master/CONTRIBUTING.md#tests)) - [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/signalapp/Signal-Desktop/blob/master/CONTRIBUTING.md#tests))
- [ ] My changes are ready to be shipped to users - [ ] My changes are ready to be shipped to users

View file

@ -6,6 +6,7 @@ on:
push: push:
branches: branches:
- development - development
- main
- '[0-9]+.[0-9]+.x' - '[0-9]+.[0-9]+.x'
pull_request: pull_request:

View file

@ -6,6 +6,7 @@ on:
push: push:
branches: branches:
- development - development
- main
- '[0-9]+.[0-9]+.x' - '[0-9]+.[0-9]+.x'
pull_request: pull_request:
@ -42,7 +43,7 @@ jobs:
macos: macos:
needs: lint needs: lint
runs-on: macos-11.0 runs-on: macos-11.0
if: github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
timeout-minutes: 30 timeout-minutes: 30
steps: steps:

View file

@ -20,7 +20,7 @@ ounce of prevention, as they say!](https://www.goodreads.com/quotes/247269-an-ou
## Developer Setup ## Developer Setup
First, you'll need [Node.js](https://nodejs.org/) which matches our current version. First, you'll need [Node.js](https://nodejs.org/) which matches our current version.
You can check [`.nvmrc` in the `development` branch](https://github.com/signalapp/Signal-Desktop/blob/development/.nvmrc) You can check [`.nvmrc` in the `main` branch](https://github.com/signalapp/Signal-Desktop/blob/main/.nvmrc)
to see what the current version is. If you have [nvm](https://github.com/creationix/nvm) to see what the current version is. If you have [nvm](https://github.com/creationix/nvm)
you can just run `nvm use` in the project directory and it will switch to the project's you can just run `nvm use` in the project directory and it will switch to the project's
desired Node.js version. [nvm for windows](https://github.com/coreybutler/nvm-windows) is desired Node.js version. [nvm for windows](https://github.com/coreybutler/nvm-windows) is
@ -199,7 +199,7 @@ So you wanna make a pull request? Please observe the following guidelines.
automatically based on that file and then periodically uploaded to Transifex for automatically based on that file and then periodically uploaded to Transifex for
translation. translation.
- [Rebase](https://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/) your - [Rebase](https://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/) your
changes on the latest `development` branch, resolving any conflicts. changes on the latest `main` branch, resolving any conflicts.
This ensures that your changes will merge cleanly when you open your PR. This ensures that your changes will merge cleanly when you open your PR.
- Be sure to add and run tests! - Be sure to add and run tests!
- Make sure the diff between the development branch and your branch contains only the - Make sure the diff between the development branch and your branch contains only the

View file

@ -28,7 +28,7 @@ https://www.transifex.com/projects/p/signal-desktop
## Contributing Code ## Contributing Code
Please see [CONTRIBUTING.md](https://github.com/signalapp/Signal-Desktop/blob/development/CONTRIBUTING.md) Please see [CONTRIBUTING.md](https://github.com/signalapp/Signal-Desktop/blob/main/CONTRIBUTING.md)
for setup instructions and guidelines for new contributors. Don't forget to sign the [CLA](https://signal.org/cla/). for setup instructions and guidelines for new contributors. Don't forget to sign the [CLA](https://signal.org/cla/).
## Contributing Funds ## Contributing Funds

View file

@ -34,7 +34,7 @@ export const About = ({
<div> <div>
<a <a
className="acknowledgments" className="acknowledgments"
href="https://github.com/signalapp/Signal-Desktop/blob/development/ACKNOWLEDGMENTS.md" href="https://github.com/signalapp/Signal-Desktop/blob/main/ACKNOWLEDGMENTS.md"
> >
{i18n('softwareAcknowledgments')} {i18n('softwareAcknowledgments')}
</a> </a>