Skip to content

Commit aa4f95c

Browse files
authored
Merge pull request #343 from KhiopsML/add-dev-v10-to-protected-branches-conditions
Add dev v10 to protected branches conditions
2 parents a8d331d + 3a655a8 commit aa4f95c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.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" or "main" branch
84+
# Set latest only if requested and on "dev", "dev-v10" or "main" branch
8585
if [[ "${{ inputs.set-latest }}" == "true" &&
86-
("$GITHUB_REF_NAME" == "dev" || "$GITHUB_REF_NAME" == "main") ]]
86+
("$GITHUB_REF_NAME" == "dev" || "$GITHUB_REF_NAME" == "dev-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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
- tests/**.py
2828
- tests/resources/**
2929
- '!tests/resources/**.md'
30-
- .github/workflows/unit-tests.yml
30+
- .github/workflows/tests.yml
3131
concurrency:
3232
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
3333
cancel-in-progress: true
@@ -109,8 +109,8 @@ jobs:
109109
$CONDA install -y -n "$CONDA_ENV" `grep -v "^\[" khiops.egg-info/requires.txt`
110110
rm -rf khiops.egg-info
111111
done
112-
- name: Prepare Unit Tests Environment
113-
if: github.ref != 'dev' && github.ref != 'main' && ! inputs.run-expensive-tests
112+
- name: Prepare Tests Environment
113+
if: github.ref != 'dev' && github.rev != 'dev-v10' && github.ref != 'main' && ! inputs.run-expensive-tests
114114
run: echo "SKIP_EXPENSIVE_TESTS=true" >> "$GITHUB_ENV"
115115
- name: Prepare Integration Tests on remote files
116116
env:

0 commit comments

Comments
 (0)