Merge branch 'revert-9b7fe356' into 'master'

Revert "Update .gitlab-ci.yml to use .pre stage."

See merge request gkowal/amun-code!1
This commit is contained in:
Grzegorz Kowal 2020-08-14 13:44:48 +00:00
commit 701bb6618b

View File

@ -3,14 +3,12 @@ image: debian
stages:
- build
prepare packages:
stage: .pre
script:
- apt -q update
- apt -q -y install gawk cmake gfortran libhdf5-dev libopenmpi-dev libzstd-dev liblz4-dev liblzma-dev pkg-config
build amun 1/2:
stage: build
before_script:
- apt -q update
- apt -q -y install gawk make gfortran libhdf5-dev libopenmpi-dev
script:
- cd ./build/
- cp -al make.default make.config
@ -26,6 +24,10 @@ build amun 1/2:
build amun 2/2:
stage: build
before_script:
- apt -q update
- apt -q -y install cmake gfortran libhdf5-dev libopenmpi-dev libzstd-dev liblz4-dev liblzma-dev pkg-config
script:
- mkdir ./build-cmake/
- cd ./build-cmake/