Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

develop replace with dev #413

Merged
merged 1 commit into from
Mar 3, 2023
Merged

develop replace with dev #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
push:
branches:
- main
- develop
- dev
pull_request:
branches:
- main
- develop
- dev

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notebooks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
push:
branches:
- main
- develop
- dev

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
push:
branches:
- main
- develop
- dev
pull_request:
branches:
- main
- develop
- dev

jobs:
build:
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ If you have any problems with the installation, they are probably due to `galsim

## Pull Requests

1. Every contribution to BTK must be made in a form of a Pull Request (PR) can eventually be merged to the `develop` branch. (NOTE: Only the maintainer(s) can push to the `main` branch)
1. Every contribution to BTK must be made in a form of a Pull Request (PR) can eventually be merged to the `dev` branch. (NOTE: Only the maintainer(s) can push to the `main` branch)

2. Every pull request must pass the workflows specified in `.github/workflows` before merging.

Expand All @@ -43,10 +43,10 @@ If you have any problems with the installation, they are probably due to `galsim

- If you get stuck by `pre-commit` errors, please ping us on your PR.

3. If other branches were merged while you were working on this PR to the `develop` branch, then you will to rebase before merging:
3. If other branches were merged while you were working on this PR to the `dev` branch, then you will to rebase before merging:

```bash
git rebase origin/develop
git rebase origin/dev
# follow the instructions and resolve conflicts...
# Feel free to ask other developers if you are not sure of the conflicts.
git push --force
Expand Down
22 changes: 11 additions & 11 deletions MAINTAINER.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@ pdm export -f requirements --without-hashes --pyproject --prod > requirements.tx
# 0. Create release tag
export RELEASE=XX.YY.ZZ

# 1. Checked out into develop branch
git checkout develop
# 1. Checked out into dev branch
git checkout dev

# 2. Fetched all remote updates
git remote update

# 3. Update local develop branch with remote copy
git pull origin develop
# 3. Update local dev branch with remote copy
git pull origin dev

# 4. Created a release branch that tracks origin/develop
git checkout -b release/$RELEASE origin/develop
# 4. Created a release branch that tracks origin/dev
git checkout -b release/$RELEASE origin/dev

# 5. Bump version in release branch
# edit pyproject.toml file to update the version
Expand Down Expand Up @@ -84,14 +84,14 @@ git push origin main
# 13. Pushed the tags to remote repository
git push origin --tags

# 14. Checkout into develop branch
git checkout develop
# 14. Checkout into dev branch
git checkout dev

# 15. Merged release branch into develop branch
# 15. Merged release branch into dev branch
git merge release/$RELEASE

# 16. Pushed develop branch to remote repository
git push origin develop
# 16. Pushed dev branch to remote repository
git push origin dev

# 17. Removed release branch from the local repository
git branch -D release/$RELEASE
Expand Down