update files

osl-incubator · Oct 25, 2024 · 9d4a645 · 9d4a645
1 parent 3416a43
commit 9d4a645
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/scicookie/hooks/post_gen_project.py b/src/scicookie/hooks/post_gen_project.py
@@ -52,11 +52,8 @@
 USE_HYPOTHESIS = {{ cookiecutter.use_hypothesis == "yes" }}
 USE_GITHUB_ACTIONS = {{ cookiecutter.use_github_actions == "yes" }}
 USE_CIRCLECI = {{ cookiecutter.use_circleci == "yes" }}
-<<<<<<< HEAD
 USE_AZURE = {{ cookiecutter.use_azure_pipelines == "yes" }}
-=======
 USE_GITLAB_CI = {{ cookiecutter.use_gitlab_ci == "yes" }}
->>>>>>> a47303e (first changes adding gitlab ci)
 {% if cookiecutter.code_of_conduct == "contributor-covenant" -%}
 COC_PATH = PROJECT_DIRECTORY / 'coc' / 'CONTRIBUTOR_COVENANT.md'
 {%- elif cookiecutter.code_of_conduct == "citizen-code-of-conduct" -%}

diff --git a/tests/smoke/ci.sh b/tests/smoke/ci.sh
@@ -6,6 +6,10 @@ SMOKE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 # Run the complete smoke tests
 . ${SMOKE_DIR}/base.sh "use_circleci=yes use_conda=yes"
 . ${SMOKE_DIR}/base.sh "use_circleci=yes use_pyenv=yes"
+. ${SMOKE_DIR}/base.sh "use_azure_pipelines=yes use_conda=yes"
+. ${SMOKE_DIR}/base.sh "use_azure_pipelines=yes use_pyenv=yes"
+. ${SMOKE_DIR}/base.sh "use_gitlab_ci=yes use_conda=yes"
+. ${SMOKE_DIR}/base.sh "use_gitlab_ci=yes use_pyenv=yes"
 
 # Check the CI files from template
 . ${SMOKE_DIR}/base-template.sh "use_circleci=yes use_conda=yes"