diff --git a/.github/workflows/install-test.yml b/.github/workflows/install-test.yml index 443b581..64016b4 100644 --- a/.github/workflows/install-test.yml +++ b/.github/workflows/install-test.yml @@ -17,19 +17,19 @@ jobs: run: docker pull agitter/singe:tmp # Docker image build fails # The repository 'http://deb.debian.org/debian stretch Release' does no longer have a Release file. -# - name: Build Docker image -# uses: docker/build-push-action@v1 -# with: -# username: ${{ secrets.DOCKER_USERNAME }} -# password: ${{ secrets.DOCKER_PASSWORD }} -# path: . -# dockerfile: docker/Dockerfile -# repository: agitter/singe -# tags: tmp -# cache_froms: agitter/singe:tmp -# add_git_labels: true -# # Only push when running on the master branch -# push: ${{ github.ref == 'refs/heads/master' }} + - name: Build Docker image + uses: docker/build-push-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + path: . + dockerfile: docker/Dockerfile + repository: agitter/singe + tags: tmp + cache_froms: agitter/singe:tmp + add_git_labels: true + # Only push when running on the master branch + push: ${{ github.ref == 'refs/heads/master' }} - name: Test SINGE run: | # Store the md5sums of the tracked source files before running tests in the Docker image diff --git a/docker/Dockerfile b/docker/Dockerfile index 7548331..8de1e1e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,7 @@ # MATLAB R2018a in a Debian environment FROM amarburg/matlab-runtime:R2018a +RUN echo "deb http://archive.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list RUN apt-get update && \ apt-get -y install libxt6 bzip2 && \ rm -rf /var/lib/apt/lists/* @@ -9,7 +10,7 @@ RUN apt-get update && \ # Python is only needed for testing SINGE and could be removed from the base # to reduce the image size ENV PATH /opt/conda/bin:$PATH -RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.6.14-Linux-x86_64.sh -O ~/miniconda.sh && \ +RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.6.14-Linux-x86_64.sh --no-check-certificate -O ~/miniconda.sh && \ /bin/bash ~/miniconda.sh -b -p /opt/conda && \ rm ~/miniconda.sh && \ /opt/conda/bin/conda clean --all && \ diff --git a/tests/environment.yml b/tests/environment.yml index e3136b0..10ba296 100644 --- a/tests/environment.yml +++ b/tests/environment.yml @@ -1,7 +1,9 @@ name: singe-test dependencies: + - h5py=2.10.0 - numpy=1.16.3 - - pip=19.1 + - pip=19.1.1 + - python=3.7.11 - scipy=1.2.1 - pip: - csvdiff==0.3.3