Skip to content

Commit

Permalink
Revive Debian Sid builds with pre-built Docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleFromKitware authored and Chuck Atkins committed May 17, 2020
1 parent 1179d4b commit 47b2473
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 84 deletions.
17 changes: 7 additions & 10 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
el7-gnu8-ohpc,
el7-gnu8-openmpi-ohpc,
suse-pgi,
suse-pgi-openmpi ]
#debian-sid,
#debian-sid-openmpi ]
suse-pgi-openmpi,
debian-sid,
debian-sid-openmpi ]
include:
- jobname: el7
container: ornladios/adios2:ci-el7
Expand All @@ -40,15 +40,12 @@ jobs:
container: ornladios/adios2:ci-suse-pgi
- jobname: suse-pgi-openmpi
container: ornladios/adios2:ci-suse-pgi-openmpi
#- jobname: debian-sid
# container: debian:sid
#- jobname: debian-sid-openmpi
# container: debian:sid
- jobname: debian-sid
container: ornladios/adios2:ci-debian-sid
- jobname: debian-sid-openmpi
container: ornladios/adios2:ci-debian-sid

steps:
- name: Bootstrap
run: /bin/sh -c "apt-get update && apt-get dist-upgrade -y && apt-get install -y git"
if: contains(matrix.jobname, 'debian')
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
5 changes: 5 additions & 0 deletions scripts/ci/cmake/ci-debian-sid-openmpi.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ ADIOS2_LIBRARY_SUFFIX:STRING=_openmpi
ADIOS2_EXECUTABLE_SUFFIX:STRING=.openmpi
MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe
MPI_C_COMPILER:FILEPATH=/usr/bin/mpicc.openmpi
MPI_CXX_COMPILER:FILEPATH=/usr/bin/mpic++.openmpi
MPI_Fortran_COMPILER:FILEPATH=/usr/bin/mpif77.openmpi
MPIEXEC_EXECUTABLE:FILEPATH=/usr/bin/mpiexec.openmpi
HDF5_C_COMPILER_EXECUTABLE:FILEPATH=/usr/bin/h5pcc.openmpi
")

set(CTEST_TEST_ARGS
Expand Down
2 changes: 2 additions & 0 deletions scripts/ci/cmake/ci-debian-sid.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ ADIOS2_USE_SST:BOOL=ON
ADIOS2_USE_ZeroMQ:BOOL=ON
ADIOS2_LIBRARY_SUFFIX:STRING=_serial
ADIOS2_EXECUTABLE_SUFFIX:STRING=.serial
HDF5_C_COMPILER_EXECUTABLE:FILEPATH=/usr/bin/h5cc
")

set(CTEST_CMAKE_GENERATOR "Ninja")
Expand Down
38 changes: 0 additions & 38 deletions scripts/ci/setup/ci-debian-sid-openmpi.sh

This file was deleted.

36 changes: 0 additions & 36 deletions scripts/ci/setup/ci-debian-sid.sh

This file was deleted.

0 comments on commit 47b2473

Please sign in to comment.