Skip to content
Snippets Groups Projects
Commit 9fab830e authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon Committed by Wittenburg, William
Browse files

Adjust circle scripts for slight differences in new image path

parent 3d8da1ad
No related branches found
No related tags found
1 merge request!253Finish image buildout
defaults: &defaults defaults: &defaults
working_directory: /home/adios2/hidecirclesource working_directory: /home/adios2
steps: steps:
- checkout - checkout /home/adios2/source
- run: - run:
name: Configure name: Configure
command: bash --login $CIRCLE_WORKING_DIRECTORY/scripts/circle/runOnCircle.sh configure command: bash --login source/scripts/circle/runOnCircle.sh configure
- run: - run:
name: Build name: Build
command: bash --login $CIRCLE_WORKING_DIRECTORY/scripts/circle/runOnCircle.sh build command: bash --login source/scripts/circle/runOnCircle.sh build
- run: - run:
name: Test name: Test
command: bash --login $CIRCLE_WORKING_DIRECTORY/scripts/circle/runOnCircle.sh test command: bash --login source/scripts/circle/runOnCircle.sh test
version: 2 version: 2
......
...@@ -9,7 +9,7 @@ set(CTEST_TEST_ARGS PARALLEL_LEVEL 4) ...@@ -9,7 +9,7 @@ set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
set(dashboard_model Experimental) set(dashboard_model Experimental)
set(dashboard_binary_name "build-$ENV{CIRCLE_JOB}") set(dashboard_binary_name "build-$ENV{CIRCLE_JOB}")
set(CTEST_SOURCE_DIRECTORY "$ENV{CIRCLE_WORKING_DIRECTORY}") set(CTEST_SOURCE_DIRECTORY "$ENV{CIRCLE_WORKING_DIRECTORY}/source")
set(CTEST_DASHBOARD_ROOT "$ENV{HOME}") set(CTEST_DASHBOARD_ROOT "$ENV{HOME}")
include(${CMAKE_CURRENT_LIST_DIR}/EnvironmentModules.cmake) include(${CMAKE_CURRENT_LIST_DIR}/EnvironmentModules.cmake)
......
...@@ -9,7 +9,7 @@ set(CTEST_TEST_ARGS PARALLEL_LEVEL 4) ...@@ -9,7 +9,7 @@ set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
set(dashboard_model Experimental) set(dashboard_model Experimental)
set(dashboard_binary_name "build_$ENV{CIRCLE_JOB}") set(dashboard_binary_name "build_$ENV{CIRCLE_JOB}")
set(CTEST_SOURCE_DIRECTORY "$ENV{CIRCLE_WORKING_DIRECTORY}") set(CTEST_SOURCE_DIRECTORY "$ENV{CIRCLE_WORKING_DIRECTORY}/source")
set(CTEST_DASHBOARD_ROOT "$ENV{HOME}") set(CTEST_DASHBOARD_ROOT "$ENV{HOME}")
include(${CMAKE_CURRENT_LIST_DIR}/EnvironmentModules.cmake) include(${CMAKE_CURRENT_LIST_DIR}/EnvironmentModules.cmake)
......
...@@ -12,7 +12,8 @@ check_var CIRCLE_WORKING_DIRECTORY ...@@ -12,7 +12,8 @@ check_var CIRCLE_WORKING_DIRECTORY
check_var CIRCLE_BRANCH check_var CIRCLE_BRANCH
check_var CIRCLE_JOB check_var CIRCLE_JOB
CTEST_SCRIPT="${CIRCLE_WORKING_DIRECTORY}/scripts/circle/circle_${CIRCLE_JOB}.cmake" SOURCE_DIR=${CIRCLE_WORKING_DIRECTORY}/source
CTEST_SCRIPT="${SOURCE_DIR}/scripts/circle/circle_${CIRCLE_JOB}.cmake"
if [ ! -f "${CTEST_SCRIPT}" ] if [ ! -f "${CTEST_SCRIPT}" ]
then then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment