From 236d86d631233b31c3667f540b43ef83c6c80549 Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Thu, 1 Aug 2024 08:52:52 +0200 Subject: [PATCH] Add NEST v38-rc2 (#242) * Merge build and deploy to fix deploy problems * Add nest-server requirements * Fix nest-desktop and compose file * Add v3.7 * Remove test * Add v3.7 to readme * Fix nestml version and add pygsl * Install nestml fix for nest verssion * Fix merging errors * Deactivate build of 3.7 and 2.20.2 in CI * Add rc2 --- ci-templates/000_3.7.gitlab-ci.yml | 2 +- ci-templates/000_3.8.gitlab-ci.yml | 4 ++-- ci-templates/003_2.20.2.gitlab-ci.yml | 2 +- src/3.8/Dockerfile | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ci-templates/000_3.7.gitlab-ci.yml b/ci-templates/000_3.7.gitlab-ci.yml index d8a05a0..0166eb9 100644 --- a/ci-templates/000_3.7.gitlab-ci.yml +++ b/ci-templates/000_3.7.gitlab-ci.yml @@ -6,7 +6,7 @@ Build_3.7: stage: build rules: - - when: always + - when: never script: # Build - docker pull nest/nest-simulator:3.7 || true diff --git a/ci-templates/000_3.8.gitlab-ci.yml b/ci-templates/000_3.8.gitlab-ci.yml index d65cb83..29757d7 100644 --- a/ci-templates/000_3.8.gitlab-ci.yml +++ b/ci-templates/000_3.8.gitlab-ci.yml @@ -12,13 +12,13 @@ Build_3.8: - docker pull nest/nest-simulator:3.8 || true - docker build --cache-from nest/nest-simulator:3.8 - --tag nest/nest-simulator:3.8_rc1 + --tag nest/nest-simulator:3.8_rc2 ./src/3.8 # Test #- docker run -i --rm nest/nest-simulator:3.8bash /opt/test-nest.sh # Deploy - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin - - docker push nest/nest-simulator:3.8_rc1 + - docker push nest/nest-simulator:3.8_rc2 - docker logout $DOCKERHUB_REGISTRY tags: - shell-runner diff --git a/ci-templates/003_2.20.2.gitlab-ci.yml b/ci-templates/003_2.20.2.gitlab-ci.yml index bb5c1ef..7ddb05d 100644 --- a/ci-templates/003_2.20.2.gitlab-ci.yml +++ b/ci-templates/003_2.20.2.gitlab-ci.yml @@ -7,7 +7,7 @@ Build_2202: stage: build # needs: ["Build_Base"] rules: - - when: always + - when: never script: # Build - docker pull nest/nest-simulator:2.20.2 || true diff --git a/src/3.8/Dockerfile b/src/3.8/Dockerfile index fbfc53e..0045661 100644 --- a/src/3.8/Dockerfile +++ b/src/3.8/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 LABEL maintainer="s.graber@fz-juelich.de" -ARG NEST_VERSION=3.8_rc1 +ARG NEST_VERSION=3.8_rc2 ARG SRC_PATH=/tmp ARG CMAKE_C_COMPILER_LAUNCHER=ccache ARG CMAKE_CXX_COMPILER_LAUNCHER=ccache @@ -126,9 +126,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ python3 -m pip install --upgrade gsl wheel setuptools swig #Latest update to nestml v8.0.0-rc1 -RUN python3 -m pip install https://api.github.com/repos/nest/nestml/zipball/pull/1087/head - - # python3 -m pip install nestml==8.0.0rc1 && \ +RUN python3 -m pip install nestml==8.0.0rc1 RUN python3 -m pip install nestml-server@git+https://github.com/babsey/nestml-server@v1.0-b4 && \ python3 -m pip install --upgrade pygsl@git+https://github.com/pygsl/pygsl@v2.3.3