Commit 98266109 authored by Matt Clarkson's avatar Matt Clarkson

Issue #1: Ensure a new build directory each new commit.

parent 8b148c76
......@@ -34,7 +34,7 @@ linux build:
script:
- export src_dir=${CI_PROJECT_DIR}
- export git_hash=${CI_COMMIT_SHORT_SHA}
- export sb_dir="${CI_PROJECT_DIR}-sb"
- export sb_dir="${CI_PROJECT_DIR}-${CI_COMMIT_SHORT_SHA}-sb"
- export pb_dir="${sb_dir}/SKSURGERYGPUCPP-build"
- echo "Sources - ${src_dir}"
- echo "Commit - ${git_hash}"
......@@ -67,7 +67,7 @@ linux test:
script:
- export src_dir=${CI_PROJECT_DIR}
- export sb_dir="${CI_PROJECT_DIR}-sb"
- export sb_dir="${CI_PROJECT_DIR}-${CI_COMMIT_SHORT_SHA}-sb"
- export pb_dir="${sb_dir}/SKSURGERYGPUCPP-build"
- pwd
- cd ${sb_dir}
......@@ -94,7 +94,7 @@ linux cleanup:
- shared-linux, cuda
script:
- export sb_dir="${CI_PROJECT_DIR}-sb"
- export sb_dir="${CI_PROJECT_DIR}-${CI_COMMIT_SHORT_SHA}-sb"
- pwd
- rm -rf ${sb_dir}
......@@ -112,7 +112,7 @@ windows build:
script:
- ${Env:src_dir} = ${CI_PROJECT_DIR}
- ${Env:git_hash} = ${CI_COMMIT_SHORT_SHA}
- ${Env:sb_dir} = "C:\gitlab-runner\scikit-surgerygpucpp-sb"
- ${Env:sb_dir} = "C:\gitlab-runner\scikit-surgerygpucpp-${Env:git_hash}-sb"
- ${Env:pb_dir} = "${Env:sb_dir}\SKSURGERYGPUCPP-build"
- echo "Sources - ${Env:src_dir}"
- echo "Commit - ${Env:git_hash}"
......@@ -148,7 +148,7 @@ windows test:
script:
- ${Env:src_dir} = ${CI_PROJECT_DIR}
- ${Env:sb_dir} = "C:\gitlab-runner\scikit-surgerygpucpp-sb"
- ${Env:sb_dir} = "C:\gitlab-runner\scikit-surgerygpucpp-${Env:git_hash}-sb"
- ${Env:pb_dir} = "${Env:sb_dir}\SKSURGERYGPUCPP-build"
- echo "Sources - ${Env:src_dir}"
- echo "Superbuild - ${Env:sb_dir}"
......@@ -179,6 +179,6 @@ windows cleanup:
- shared-win-cuda
script:
- ${Env:sb_dir} = "C:\gitlab-runner\scikit-surgerygpucpp-sb"
- ${Env:sb_dir} = "C:\gitlab-runner\scikit-surgerygpucpp-${Env:git_hash}-sb"
- if (Test-Path ${Env:sb_dir}) { Remove-Item ${Env:sb_dir} -Recurse; if ($LastExitCode -ne 0) {throw $LastExitCode} }
- if ($LastExitCode -ne 0) {throw $LastExitCode}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment