Merge branch 'develop' into '2021_NewPaper'

Develop

See merge request !99

.gitlab-ci.yml

@@ -3,7 +3,7 @@ variables:
 
 before_script:
   - module load singularity/3.5.3
-  - module load awscli/1.19.17
+  - module load awscli/1.11.139
 
 stages:
   - build_stage
@@ -13,30 +13,30 @@ stages:
 build.dev:
   stage: build_stage
   script:
-  - singularity run 'docker://monachus/hugo' hugo --baseURL http://dev.strandlab.net/
+    - singularity run 'docker://monachus/hugo' hugo --baseURL https://dev.strandlab.net/
   artifacts:
     paths:
-    - public/
+      - public/
     expire_in: 1 week
   cache:
     paths:
-    - public/
+      - public/
   except:
     - tags
 
 build.live:
   stage: build_stage
   script:
-  - singularity run 'docker://monachus/hugo' hugo
+    - singularity run 'docker://monachus/hugo' hugo
   artifacts:
     paths:
-    - public/
+      - public/
     expire_in: 1 week
   cache:
     paths:
-    - public/
+      - public/
   only:
-  - tags
+    - tags
 
 test:
   stage: test_stage
@@ -46,17 +46,17 @@ test:
 deploy.dev:
   stage: deploy_stage
   script:
-  - singularity run 'docker://monachus/hugo' hugo deploy --target aws-dev --maxDeletes -1
+    - singularity run 'docker://monachus/hugo' hugo deploy --target aws-dev --maxDeletes -1
   dependencies:
-  - build.dev
+    - build.dev
   only:
-  - master
+    - master
   except:
-  - tags
+    - tags
 
 deploy.live:
   stage: deploy_stage
   script:
-  - singularity run 'docker://monachus/hugo' hugo deploy --target aws --maxDeletes -1
+    - singularity run 'docker://monachus/hugo' hugo deploy --target aws --maxDeletes -1
   only:
-  - tags
\ No newline at end of file
+    - tags