Skip to content

Fix continuous integration #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcfr merged 4 commits into from
Feb 10, 2022
Merged

Fix continuous integration #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8866fea
COMP: Update CI removing obsolete testing env. for ITK 4.8.0, 4.10.1 …
jcfr Feb 10, 2022
0c0ca93
README: Update badges to use "shields.io" instead of obsolete "microb…
jcfr Feb 10, 2022
0419f97
ENH: Update "itk-master_use_system_libraries-off" and publish docker …
jcfr Feb 10, 2022
4d8683c
BUG: Fix CI updating "itk-master_use_system_libraries-off" docker image
jcfr Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,6 @@ build-settings: &build-settings

version: 2
jobs:
itk-v4.8.0_use_system_libraries-off:
<<: *build-settings
docker:
- image: slicer/slicerexecutionmodel:${CIRCLE_JOB}
steps:
- checkout
- run:
command: ./test/Docker/test.sh ${CIRCLE_JOB}

# ITK v4.10.1
itk-v4.10.1_use_system_libraries-off:
<<: *build-settings
docker:
- image: slicer/slicerexecutionmodel:${CIRCLE_JOB}
steps:
- checkout
- run:
command: ./test/Docker/test.sh ${CIRCLE_JOB}
- run:
command: ./test/Docker/test-serializer.sh ${CIRCLE_JOB}

# ITK v4.13.0
itk-v4.13.0_use_system_libraries-off:
<<: *build-settings
docker:
- image: slicer/slicerexecutionmodel:${CIRCLE_JOB}
steps:
- checkout
- run:
command: ./test/Docker/test.sh ${CIRCLE_JOB}
- run:
command: ./test/Docker/test-serializer.sh ${CIRCLE_JOB}


# ITK master
itk-master_use_system_libraries-off:
Expand All @@ -53,7 +20,4 @@ workflows:
version: 2
build-test:
jobs:
- itk-v4.8.0_use_system_libraries-off
- itk-v4.10.1_use_system_libraries-off
- itk-v4.13.0_use_system_libraries-off
- itk-master_use_system_libraries-off
18 changes: 13 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,20 @@ environment is made available in docker images:
* Testing using a given environment is enabled updating the [.circleci/config.yml](.circleci/config.yml) file.
* Before enabling an environment, associated docker image has to be (1) built locally and (2) pushed to [dockerhub](https://hub.docker.com/r/slicer/slicerexecutionmodel/tags/).

Available environments are:
#### Available environments

* [![](https://images.microbadger.com/badges/version/slicer/slicerexecutionmodel:itk-v4.8.0_use_system_libraries-off.svg)](https://microbadger.com/images/slicer/slicerexecutionmodel:itk-v4.8.0_use_system_libraries-off)
* [![](https://images.microbadger.com/badges/version/slicer/slicerexecutionmodel:itk-v4.10.1_use_system_libraries-off.svg)](https://microbadger.com/images/slicer/slicerexecutionmodel:itk-v4.10.1_use_system_libraries-off)
* [![](https://images.microbadger.com/badges/version/slicer/slicerexecutionmodel:itk-v4.13.0_use_system_libraries-off.svg)](https://microbadger.com/images/slicer/slicerexecutionmodel:itk-v4.13.0_use_system_libraries-off)
* [![](https://images.microbadger.com/badges/version/slicer/slicerexecutionmodel:itk-master_use_system_libraries-off.svg)](https://microbadger.com/images/slicer/slicerexecutionmodel:itk-master_use_system_libraries-off)
* [![](https://img.shields.io/docker/image-size/slicer/slicerexecutionmodel/itk-master_use_system_libraries-off)](https://hub.docker.com/r/slicer/slicerexecutionmodel/tags?page=1&name=itk-master_use_system_libraries-off)


#### Deprecated environments

_Deprecated environments are not maintained, corresponding Dockerfiles have been deleted and associated SlicerExecutionModel continuous integration settings have been removed._

* [![](https://img.shields.io/docker/image-size/slicer/slicerexecutionmodel/itk-v4.8.0_use_system_libraries-off)](https://hub.docker.com/r/slicer/slicerexecutionmodel/tags?page=1&name=itk-v4.8.0_use_system_libraries-off)

* [![](https://img.shields.io/docker/image-size/slicer/slicerexecutionmodel/itk-v4.10.1_use_system_libraries-off)](https://hub.docker.com/r/slicer/slicerexecutionmodel/tags?page=1&name=itk-v4.10.1_use_system_libraries-off)

* [![](https://img.shields.io/docker/image-size/slicer/slicerexecutionmodel/itk-v4.13.0_use_system_libraries-off)](https://hub.docker.com/r/slicer/slicerexecutionmodel/tags?page=1&name=itk-v4.13.0_use_system_libraries-off)


### Adding or updating a testing environment
Expand Down
7 changes: 4 additions & 3 deletions test/Docker-ITK-master_USE_SYSTEM_LIBRARIES-OFF/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ MAINTAINER Insight Software Consortium <community@itk.org>

WORKDIR /usr/src

# March 15, 2020
ENV ITK_GIT_COMMIT d67ae984a703a71b2d8d6932216561157b322c28
# February 10, 2022
# - master (d6774dac0) of 2022-02-07 and changes from https://github.com/InsightSoftwareConsortium/ITK/pull/3187
ENV ITK_GIT_COMMIT 060131b628e9a2d3f4613adc077ac04dd1a4ea7b

RUN \
#
Expand All @@ -14,7 +15,7 @@ RUN \
#
# Checkout
#
git clone git://github.com/InsightSoftwareConsortium/ITK ITK && \
git clone git://github.com/jcfr/ITK ITK && \
cd ITK && git reset --hard ${ITK_GIT_COMMIT} && \
#
# Configure
Expand Down
56 changes: 0 additions & 56 deletions test/Docker-ITK-v4.10.1_USE_SYSTEM_LIBRARIES-OFF/Dockerfile
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions test/Docker-ITK-v4.13.0_USE_SYSTEM_LIBRARIES-OFF/Dockerfile
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions test/Docker-ITK-v4.8.0_USE_SYSTEM_LIBRARIES-OFF/Dockerfile
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions test/Docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ ORG = slicer
REPO = slicerexecutionmodel

DIRECTORIES = \
Docker-ITK-master_USE_SYSTEM_LIBRARIES-OFF \
Docker-ITK-v4.13.0_USE_SYSTEM_LIBRARIES-OFF \
Docker-ITK-v4.10.1_USE_SYSTEM_LIBRARIES-OFF \
Docker-ITK-v4.8.0_USE_SYSTEM_LIBRARIES-OFF
Docker-ITK-master_USE_SYSTEM_LIBRARIES-OFF

# On CircleCI, do not attempt to delete container
# See https://circleci.com/docs/docker-btrfs-error/
Expand Down