Skip to content

Commit 4813277

Browse files
authored
Merge pull request #46 from thewtex/ci-update
CI updates
2 parents 4c2fc53 + 9314be4 commit 4813277

File tree

2 files changed

+26
-12
lines changed

2 files changed

+26
-12
lines changed

.circleci/config.yml

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,41 @@
11
version: 2
22
jobs:
33
build-and-test:
4-
working_directory: ~/ITKTextureFeatures-build
4+
working_directory: /ITKTextureFeatures-build
55
docker:
66
- image: insighttoolkit/module-ci:latest
77
steps:
88
- checkout:
9-
path: ~/ITKTextureFeatures
9+
path: /ITKTextureFeatures
1010
- run:
11-
name: Configure
11+
name: Fetch CTest driver script
1212
command: |
13-
cmake \
14-
-DITK_DIR:PATH=/ITK-build \
15-
-DBUILD_TESTING:BOOL=ON \
16-
-DBUILDNAME:STRING=External-ITKTextureFeatures-${CIRCLE_BRANCH}-${CIRCLE_BUILD_NUM} \
17-
~/ITKTextureFeatures
13+
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITK/dashboard/itk_common.cmake -O
14+
- run:
15+
name: Configure CTest script
16+
command: |
17+
SHASNIP=$(echo $CIRCLE_SHA1 | cut -c1-7)
18+
cat > dashboard.cmake << EOF
19+
set(CTEST_SITE "CircleCI")
20+
set(CTEST_BUILD_NAME "External-ITKTextureFeatures-${CIRCLE_BRANCH}-${CIRCLE_BUILD_NUM}-${SHASNIP}")
21+
set(CTEST_BUILD_CONFIGURATION "MinSizeRel")
22+
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
23+
set(CTEST_BUILD_FLAGS: "-j5")
24+
set(CTEST_SOURCE_DIRECTORY /ITKTextureFeatures)
25+
set(CTEST_BINARY_DIRECTORY /ITKTextureFeatures-build)
26+
set(dashboard_model Experimental)
27+
set(dashboard_no_clean 1)
28+
set(dashboard_cache "
29+
ITK_DIR:PATH=/ITK-build
30+
BUILD_TESTING:BOOL=ON
31+
")
32+
include(\${CTEST_SCRIPT_DIRECTORY}/itk_common.cmake)
33+
EOF
1834
- run:
1935
name: Build and Test
2036
no_output_timeout: 1.0h
21-
environment:
22-
CTEST_BUILD_FLAGS: "-j5"
2337
command: |
24-
ctest -j 2 -VV -D Experimental
38+
ctest -j 2 -VV -S dashboard.cmake
2539
package:
2640
working_directory: ~/ITKTextureFeatures
2741
machine: true

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ script:
1313
- chmod u+x macpython-download-cache-and-build-module-wheels.sh
1414
- ./macpython-download-cache-and-build-module-wheels.sh
1515
- tar -zcvf dist.tar.gz dist/
16-
- curl --upload-file dist.tar.gz https://transfer.sh/dist.tar.gz
16+
- curl -F file="@dist.tar.gz" https://filebin.ca/upload.php

0 commit comments

Comments
 (0)