diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c0f02473..d5fe747e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,8 +8,8 @@ - [ ] Doxygen documentation of the code completed (classes, methods, types, members...). - [ ] Main tool doxygen documentation (following existing documentation of [DGtalTools documentation](http://dgtal.org/doc/tools/nightly/). -- [ ] Check if it follows the tools structure described in [CONTRIBUTING.md](https://github.com/DGtal-team/DGtalTools/blob/master/CONTRIBUTING.md) -- [ ] New entry in the [ChangeLog.md](https://github.com/DGtal-team/DGtalTools/blob/master/ChangeLog.md) added. +- [ ] Check if it follows the tools structure described in [CONTRIBUTING.md](https://github.com/DGtal-team/DGtalTools/blob/main/CONTRIBUTING.md) +- [ ] New entry in the [ChangeLog.md](https://github.com/DGtal-team/DGtalTools/blob/main/ChangeLog.md) added. - [ ] Update the readme with potentially a screenshot of the tools if it applies. - [ ] No warning raised in Debug ```cmake``` mode (otherwise, Github Actions C.I. will fail). - [ ] All continuous integration tests pass (Github Actions). diff --git a/.github/workflows/buildAndDocumentation.yml b/.github/workflows/buildAndDocumentation.yml index 6295f98e..6c58086f 100644 --- a/.github/workflows/buildAndDocumentation.yml +++ b/.github/workflows/buildAndDocumentation.yml @@ -2,9 +2,9 @@ name: CI (linux/macOS/windows) on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) diff --git a/.github/workflows/deployDoc-master.yml b/.github/workflows/deployDoc-main.yml similarity index 97% rename from .github/workflows/deployDoc-master.yml rename to .github/workflows/deployDoc-main.yml index a59faf3a..89d801e1 100644 --- a/.github/workflows/deployDoc-master.yml +++ b/.github/workflows/deployDoc-main.yml @@ -2,7 +2,7 @@ name: CI (linux/macOS/windows) on: push: - branches: [ master ] + branches: [ main ] jobs: @@ -48,7 +48,7 @@ jobs: uses: JamesIves/github-pages-deploy-action@v4 with: token: ${{ secrets.DGTALTOOLSDOC }} - branch: master + branch: main repository-name: DGtal-team/doctools-nightly folder: build/html single-comit: true diff --git a/ChangeLog.md b/ChangeLog.md index 35a2fa20..cb9420f9 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -2,7 +2,9 @@ - *global* - Following the new display introduced from polyscope viewer, the illustrations of tools in the documentations was obsolete. It also add some fix when reproducing examples. Some links were also broken from the new organization. (Bertrand Kerautret [476](https://github.com/DGtal-team/DGtalTools/pull/476)) - + + - Default branch set to main instead old master. + (Bertrand Kerautret [477](https://github.com/DGtal-team/DGtalTools/pull/477)) # DGtalTools 2.1