diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml
index 5ca95fc2070a8ca66e46c4e8a121ed3337aa8f20..b807ab28d35b9bacb3e5053fc627d26a2d9d86db 100644
--- a/scripts/ci/jobs/build-gui-win.yml
+++ b/scripts/ci/jobs/build-gui-win.yml
@@ -2,6 +2,7 @@ build gui win:
extends: .template-build-win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
+ - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
- changes:
- Applications/DataExplorer/**/*
- when: manual
diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml
index 1c77dc0c1cf0180cc59d937485e21f69785624c8..bd4459720dec7268ef43a4f545ba0f5608f299c8 100644
--- a/scripts/ci/jobs/build-win.yml
+++ b/scripts/ci/jobs/build-win.yml
@@ -3,6 +3,7 @@ build win:
rules:
- if: '$USE_PYTHON =~ /ON$/'
- if: '$CI_COMMIT_BRANCH == "master"'
+ - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
- when: manual
allow_failure: true
variables:
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index b3b2450f5fd576dd66ff7c36130a82f1a8465963..f5fe53e144fffe70429c04571abe69a578d88355 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -1,6 +1,8 @@
build container images:
stage: preparation
rules:
+ - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
+ when: never
- if: '$CI_PROJECT_NAMESPACE == "bilke" || $CI_PROJECT_NAMESPACE == "ogs"'
changes:
- ThirdParty/container-maker
@@ -24,6 +26,8 @@ build container images:
build xunit-to-junit image:
stage: .pre
rules:
+ - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
+ when: never
- if: '$CI_PROJECT_NAMESPACE == "bilke" || $CI_PROJECT_NAMESPACE == "ogs"'
changes:
- scripts/docker/saxon/**/*
@@ -39,6 +43,8 @@ build xunit-to-junit image:
build pre-commit image:
stage: .pre
rules:
+ - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
+ when: never
- if: '$CI_PROJECT_NAMESPACE == "bilke" || $CI_PROJECT_NAMESPACE == "ogs"'
changes:
- scripts/docker/Dockerfile.pre-commit
@@ -53,6 +59,8 @@ build pre-commit image:
build web image:
stage: .pre
rules:
+ - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
+ when: never
- if: '$CI_PROJECT_NAMESPACE == "bilke" || $CI_PROJECT_NAMESPACE == "ogs"'
changes:
- scripts/docker/Dockerfile.web
diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml
index d052e9f038b40050ba8f8891430766eece525759..3d2465d5bcdfe271c16c1fce53003774bfb4746e 100644
--- a/scripts/ci/jobs/container.yml
+++ b/scripts/ci/jobs/container.yml
@@ -1,3 +1,4 @@
+# Built for Sandy Bridge (envinf1) and newer
container:
stage: package
tags: [envinf2-shell]
@@ -7,27 +8,31 @@ container:
- if: $CI_COMMIT_TAG
- changes:
- scripts/ci/jobs/container.yml
+ - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
+ - when: manual
+ allow_failure: true
extends:
- .container-maker-setup
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - if [[ "$CI_COMMIT_BRANCH" == "master" ]] ;then export DOCKER_TAG="--tag $CI_REGISTRY/ogs/$CI_PROJECT_NAME/ogs-serial:latest" ; fi
- >
poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
--build_args ' --progress=plain'
--pm system --cvode --ccache
- --cmake_args ' -DBUILD_TESTING=OFF -DOGS_BUILD_UTILS=ON -DOGS_USE_PYTHON=ON'
- --tag $CI_REGISTRY/ogs/$CI_PROJECT_NAME/ogs-serial:latest --upload
+ --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DBUILD_TESTING=OFF -DOGS_BUILD_UTILS=ON -DOGS_USE_PYTHON=ON'
+ $DOCKER_TAG
- >
poetry run ogscm compiler.py mpi.py ogs.py -B -C -R --ogs ../..
--build_args ' --progress=plain'
--pm system --cvode --ccache
- --cmake_args ' -DBUILD_TESTING=OFF'
+ --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DBUILD_TESTING=OFF'
--base_image 'centos:8' --ompi 4.0.5 --mpi_benchmarks
- >
poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
--build_args ' --progress=plain'
--pm system --cvode --ccache
- --cmake_args ' -DBUILD_TESTING=OFF'
+ --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DBUILD_TESTING=OFF'
--gui
artifacts:
name: container
diff --git a/web/layouts/section/releases.html b/web/layouts/section/releases.html
index 135a90c7da6dc1875d8b849137f2b55b9f28bd62..7d03ecdf797ba58b6b19692520ea17bef457ba64 100644
--- a/web/layouts/section/releases.html
+++ b/web/layouts/section/releases.html
@@ -25,7 +25,7 @@
Here you can find the latest version of OpenGeoSys. But be warned: although this version was
successfully tested by the continuous integration system it may be unstable or incomplete...
</p>
- <div class="bg-gray-100 py-1 px-4 rounded-lg shadow mb-12">
+ <div class="bg-red-50 py-1 px-4 rounded-lg shadow mb-12">
<h3><i class="far fa-download"></i> Downloads</h3>
<p>
Downloads for the current development version of OpenGeoSys can be found on our continuous integration system:
@@ -37,8 +37,8 @@
-->
{{ range .Params.head_downloads }}
<li>
- <i class="{{ .icon }}"></i> <a href="{{ .url }}">{{ .name }}</a>{{ if .note }} <span
- class="text-sm">({{ .note | markdownify }})</span>{{ end }}
+ <i class="{{ .icon }}"></i> <a href="{{ .url }}">{{ .name }}</a>
+ {{ if .note }} <span class="text-sm">({{ .note | markdownify }})</span>{{ end }}
</li>
{{ end }}
</ul>
@@ -46,6 +46,26 @@
<hr>
{{ range first 1 .Data.Pages }}
+ {{ $vtag := (print "v" .Params.tag ) }}
+ <h1 id="latest">Current release with bug-fixes: {{ .Params.tag }}</h1>
+ <p>
+ Here you can find the last released version ({{ .Params.tag }}) of OpenGeoSys
+ <a href="https://gitlab.opengeosys.org/ogs/ogs/-/tree/{{ $vtag }}"> enhanced with bug-fixes</a>.
+ We recommend to use this version for production.
+ </p>
+ <div class="bg-green-50 py-1 px-4 rounded-lg shadow mb-12">
+ <h3><i class="far fa-download"></i> Downloads</h3>
+ <ul>
+ {{ range $.Params.head_downloads }}
+ <li>
+ <i class="{{ .icon }}"></i>
+ <a href='{{ replace .url "master" $vtag }}'>{{ replace .name "Latest" $vtag }}</a>
+ {{ if .note }} <span class="text-sm">({{ .note | markdownify }})</span>{{ end }}
+ </li>
+ {{ end }}
+ </ul>
+ </div>
+
<h1 class="mt-0" id="current"><i class="far fa-stars"></i> Current Release: <a style="text-decoration: none;"
href="{{ .Permalink }}">{{ .Title }}</a></h1>