+5 -5

HACKING.adoc

reviewed

··· 76 76 clarifying comments can be an excellent contribution to help you, 77 77 next time, and other code readers. 78 78 79 79 - * The https://github.com/ocaml/ocaml[github project] contains a lot of 79 79 + * The https://github.com/ocaml/ocaml[GitHub project] contains a lot of 80 80 pull requests, many of them being in dire need of a review -- we 81 81 have more people willing to contribute changes than to review 82 82 someone else's change. Picking one of them, trying to understand the ··· 221 221 [#tips] 222 222 == Development tips and tricks 223 223 224 224 - === Keep merge commits when merging and cherry-picking Github PRs 224 224 + === Keep merge commits when merging and cherry-picking GitHub PRs 225 225 226 226 - Having the Github PR number show up in the git log is very useful for 226 226 + Having the GitHub PR number show up in the git log is very useful for 227 227 later triaging. We recently disabled the "Rebase and merge" button, 228 228 precisely because it does not produce a merge commit. 229 229 ··· 690 690 INRIA provides a Jenkins continuous integration service that OCaml 691 691 uses, see link:https://ci.inria.fr/ocaml/[]. It provides a wider 692 692 architecture support (MSVC and MinGW, a zsystems s390x machine, and 693 693 - various MacOS versions) than the Travis/AppVeyor testing on github, 693 693 + various MacOS versions) than the Travis/AppVeyor testing on GitHub, 694 694 but only runs on commits to the trunk or release branches, not on every 695 695 PR. 696 696 ··· 708 708 709 709 If you have suspicions that your changes may fail on exotic architectures 710 710 (they touch the build system or the backend code generator, 711 711 - for example) and would like to get wider testing than github's CI 711 711 + for example) and would like to get wider testing than GitHub's CI 712 712 provides, it is possible to manually start INRIA's CI on arbitrary git 713 713 branches even before opening a pull request as follows: 714 714

+6 -6

README.adoc

reviewed

··· 16 16 |===== 17 17 | Branch `trunk` | Branch `5.4` | Branch `5.3` | Branch `5.2` | Branch `4.14` 18 18 19 19 - | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=trunk["Github CI Build Status (trunk branch)", 19 19 + | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=trunk["GitHub CI Build Status (trunk branch)", 20 20 link="https://github.com/ocaml/ocaml/actions?query=workflow%3ABuild"] 21 21 - image:https://github.com/ocaml/ocaml/workflows/Hygiene/badge.svg?branch=trunk["Github CI Hygiene Status (trunk branch)", 21 21 + image:https://github.com/ocaml/ocaml/workflows/Hygiene/badge.svg?branch=trunk["GitHub CI Hygiene Status (trunk branch)", 22 22 link="https://github.com/ocaml/ocaml/actions?query=workflow%3AHygiene"] 23 23 image:https://ci.appveyor.com/api/projects/status/github/ocaml/ocaml?branch=trunk&svg=true["AppVeyor Build Status (trunk branch)", 24 24 link="https://ci.appveyor.com/project/avsm/ocaml"] 25 25 - | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=5.4["Github CI Build Status (5.4 branch)", 25 25 + | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=5.4["GitHub CI Build Status (5.4 branch)", 26 26 link="https://github.com/ocaml/ocaml/actions?query=workflow%3ABuild"] 27 27 image:https://ci.appveyor.com/api/projects/status/github/ocaml/ocaml?branch=5.4&svg=true["AppVeyor Build Status (5.4 branch)", 28 28 link="https://ci.appveyor.com/project/avsm/ocaml"] 29 29 - | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=5.3["Github CI Build Status (5.3 branch)", 29 29 + | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=5.3["GitHub CI Build Status (5.3 branch)", 30 30 link="https://github.com/ocaml/ocaml/actions?query=workflow%3ABuild"] 31 31 image:https://ci.appveyor.com/api/projects/status/github/ocaml/ocaml?branch=5.3&svg=true["AppVeyor Build Status (5.3 branch)", 32 32 link="https://ci.appveyor.com/project/avsm/ocaml"] 33 33 - | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=5.2["Github CI Build Status (5.2 branch)", 33 33 + | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=5.2["GitHub CI Build Status (5.2 branch)", 34 34 link="https://github.com/ocaml/ocaml/actions?query=workflow%3ABuild"] 35 35 image:https://ci.appveyor.com/api/projects/status/github/ocaml/ocaml?branch=5.2&svg=true["AppVeyor Build Status (5.2 branch)", 36 36 link="https://ci.appveyor.com/project/avsm/ocaml"] 37 37 - | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=4.14["Github CI Build Status (4.14 branch)", 37 37 + | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=4.14["GitHub CI Build Status (4.14 branch)", 38 38 link="https://github.com/ocaml/ocaml/actions?query=workflow%3ABuild"] 39 39 image:https://ci.appveyor.com/api/projects/status/github/ocaml/ocaml?branch=4.14&svg=true["AppVeyor Build Status (4.14 branch)", 40 40 link="https://ci.appveyor.com/project/avsm/ocaml"]