Skip to content

Commit dfed62e

Browse files
committed
Use only main and main-v10 as target branches in the CI and templates
Thus: - main is renamed to main-v10 - dev is renamed to main, - dev-v10 is merged into main-v10, then deleted. The CI and GitHub pull request template are updated according to this change.
1 parent 10fb357 commit dfed62e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ _Put your message here_
44
---
55

66
### TODO Before Asking for a Review
7-
- [ ] Rebase your branch to the latest version of `dev` (or `main` for release PRs)
7+
- [ ] Rebase your branch to the latest version of `main` (or `main-v10`)
88
- [ ] Make sure all CI workflows are green
99
- [ ] When adding a public feature/fix: Update the `Unreleased` section of `CHANGELOG.md` (no date)
1010
- [ ] Self-Review: Review "Files Changed" tab and fix any problems you find
1111
- API Docs (only if there are changes in docstrings, rst files or samples):
1212
- [ ] Check the docs build **without** warning: see the log of the API Docs workflow
1313
- [ ] Check that your changes render well in HTML: download the API Docs artifact and open `index.html`
14-
- If there are any problems it is faster to iterate by [building locally the API Docs](../blob/dev/doc/README.md#build-the-documentation)
14+
- If there are any problems it is faster to iterate by [building locally the API Docs](../blob/main/doc/README.md#build-the-documentation)

.github/workflows/dev-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ jobs:
8181
- name: Set up the Docker Image Tags
8282
run: |
8383
set -x
84-
# Set latest only if requested and on "dev", "dev-v10" or "main" branch
84+
# Set latest only if requested and on "main-v10" or "main" branch
8585
if [[ "${{ inputs.set-latest }}" == "true" &&
86-
("$GITHUB_REF_NAME" == "dev" || "$GITHUB_REF_NAME" == "dev-v10" || "$GITHUB_REF_NAME" == "main") ]]
86+
("$GITHUB_REF_NAME" == "main-v10" || "$GITHUB_REF_NAME" == "main") ]]
8787
then
8888
DOCKER_IMAGE_TAGS="$IMAGE_URL:latest,$IMAGE_URL:$KHIOPS_REVISION.$IMAGE_INCREMENT"
8989
else

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ jobs:
112112
rm -f requires.txt
113113
done
114114
- name: Configure Expensive Tests Setting
115-
# Skip expensive tests by default, unless on the `dev`, `dev-v10` or `main` branches
116-
if: github.ref != 'dev' && github.ref != 'dev-v10' && github.ref != 'main' && ! inputs.run-expensive-tests
115+
# Skip expensive tests by default, unless on the `main-v10` or `main` branches
116+
if: github.ref != 'main-v10' && github.ref != 'main' && ! inputs.run-expensive-tests
117117
run: echo "SKIP_EXPENSIVE_TESTS=true" >> "$GITHUB_ENV"
118118
- name: Prepare Integration Tests on remote files
119119
if: env.SKIP_EXPENSIVE_TESTS != 'true'

0 commit comments

Comments
 (0)