Skip to content
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.

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

Add NEST v38-rc2 #242

Merged
merged 26 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
29adbb2
Merge build and deploy to fix deploy problems
steffengraber Feb 9, 2024
3d52979
Merge remote-tracking branch 'upstream/master'
steffengraber Mar 7, 2024
e1cfa85
Merge remote-tracking branch 'upstream/master'
steffengraber Mar 8, 2024
d63f2f4
Merge remote-tracking branch 'upstream/master'
steffengraber Mar 26, 2024
ab7e910
Merge remote-tracking branch 'upstream/master'
steffengraber Apr 4, 2024
1adf82e
Add nest-server requirements
steffengraber Apr 4, 2024
5301617
Fix nest-desktop and compose file
steffengraber Apr 4, 2024
c384fb0
Add v3.7
steffengraber Apr 12, 2024
93b1397
Merge branch 'fix-nest-server'
steffengraber Apr 12, 2024
a52208a
Merge remote-tracking branch 'upstream/master'
steffengraber Apr 15, 2024
d01ede0
Remove test
steffengraber Apr 19, 2024
fa70bbb
Add v3.7 to readme
steffengraber Apr 19, 2024
fe3ca17
Merge remote-tracking branch 'upstream/master'
steffengraber May 15, 2024
52d7575
Fix nestml version and add pygsl
steffengraber May 15, 2024
5fd6274
Merge remote-tracking branch 'upstream/master'
steffengraber Jun 17, 2024
685f670
Merge remote-tracking branch 'upstream/master'
steffengraber Jun 20, 2024
d016e77
Merge remote-tracking branch 'upstream/master'
steffengraber Jul 17, 2024
b2ee7da
Install nestml fix for nest verssion
steffengraber Jul 17, 2024
00d1176
Merge remote-tracking branch 'upstream/master'
steffengraber Jul 18, 2024
28e1391
Fix merging errors
steffengraber Jul 18, 2024
de16dfe
Merge remote-tracking branch 'upstream/master'
steffengraber Jul 22, 2024
4527fa9
Merge remote-tracking branch 'upstream/master'
steffengraber Jul 22, 2024
c567942
Merge remote-tracking branch 'upstream/master'
steffengraber Jul 22, 2024
1174227
Merge remote-tracking branch 'upstream/master'
steffengraber Aug 1, 2024
e99a8a3
Deactivate build of 3.7 and 2.20.2 in CI
steffengraber Aug 1, 2024
fe8fe76
Add rc2
steffengraber Aug 1, 2024
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
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