Skip to content

Commit

Permalink
Add NEST v38-rc2 (#242)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
steffengraber authored Aug 1, 2024
1 parent 0a68ab6 commit 236d86d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ci-templates/000_3.7.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Build_3.7:
stage: build
rules:
- when: always
- when: never
script:
# Build
- docker pull nest/nest-simulator:3.7 || true
Expand Down
4 changes: 2 additions & 2 deletions ci-templates/000_3.8.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci-templates/003_2.20.2.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions src/3.8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:22.04
LABEL maintainer="[email protected]"

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
Expand Down Expand Up @@ -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/[email protected] && \
python3 -m pip install --upgrade pygsl@git+https://github.com/pygsl/[email protected]
Expand Down

0 comments on commit 236d86d

Please sign in to comment.