这是indexloc提供的服务，不要输入任何密码
Skip to content

Change mentions of 'checkall' to 'checkmerge' #1755

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

Merged
merged 1 commit into from
Mar 4, 2025
Merged

Change mentions of 'checkall' to 'checkmerge' #1755

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
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATES/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

- [ ] I have read the [contribution guide](doc/contributing.md)
- [ ] I have added my info to [copying.md](copying.md) (only first time contributors)
- [ ] I have run `make checkall` and fixed all mentioned problems
- [ ] I have run `make checkmerge` and fixed all mentioned problems


### Description
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ help: $(BUILDDIR)/Makefile
@echo "tests -> run the tests (py + cpp)"
@echo ""
@echo "checkall -> full code compliance check"
@echo "checkmerge -> code compliance check for merging to master"
@echo "checkfast -> fast checks only"
@echo "checkchanged -> full check for all files changed since origin/master"
@echo "checkuncommited -> full check for all currently uncommited files"
Expand Down
2 changes: 1 addition & 1 deletion doc/buildsystem.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Additional recipes:
- `doc` (generate docs via Doxygen)
- `test` (runs the various tests)
- various cleaning recipes: `cleanelf`, `cleancodegen`, `cleancython`, `cleaninsourcebuild`, `cleanpxdgen`, `cleanbuilddirs`, `mrproper`, `mrproperer`
- various compliance checkers: `checkfast`, `checkall`, ...
- various compliance checkers: `checkfast`, `checkmerge`, `checkall`, ...


Phases
Expand Down
4 changes: 2 additions & 2 deletions doc/contributing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ tl;dr
- Add yourself to `copying.md`
- `git add libopenage/unit/tentacle_monster.cpp`
- `git commit -m "engine: fixed vomiting animation of tentacle monster"`
- `make checkall`
- `make checkmerge`
- `make test`
- `git push origin tentacle-monster-fix`
- Create a pull request and look at the CI output
Expand Down Expand Up @@ -101,7 +101,7 @@ Before making a pull request, it's good to review these things:
- Run `make test` to check whether any functionality has been broken
- [Check your whitespaces](https://github.com/SFTtech/openage/blob/master/doc/code_style/tabs_n_spaces.md)
- [Read all the codestyle docs]( https://github.com/SFTtech/openage/tree/master/doc/code_style)
- Before pushing, run `make checkall`. If that fails, the automatic buildbot will reject your code.
- Before pushing, run `make checkmerge`. If that fails, the automatic buildbot will reject your code.
- If this is your first contribution, add yourself to the authors list in [copying.md](/copying.md).
- Commit messages should be meaningful, they should say in a sentence (or very little text) what
changes it has without requiring to read the entire diff. [tpope knows this very well!](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
Expand Down
2 changes: 1 addition & 1 deletion doc/ide/configs/vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"type": "shell",
"command": "make",
"args": [
"checkall"
"checkmerge"
],
"group": "build",
"presentation": {
Expand Down
Loading