diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0835946e39f98e2b34277ed57e4978c20d16bee..4223f0e3b9fe8a7cc87b3e4a83ba1f84eddabef1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,9 +49,6 @@ workflow: - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_PATH == "ogs/ogs"' # master, ogs/ogs repo only variables: PIPELINE_NAME: "master pipeline" - - if: '$CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/ && $CI_PROJECT_PATH == "ogs/ogs"' # release branches, e.g. v6.x.x - variables: - PIPELINE_NAME: "bugfix branch $CI_COMMIT_BRANCH pipeline" include: - local: "scripts/ci/extends/*.yml" diff --git a/web/content/docs/devguide/advanced/offline-build/index.md b/web/content/docs/devguide/advanced/offline-build/index.md index ac618bcfe085a8a632569abd2ee8f6a642a8a14b..737c26f9c96a05350a694cee9ded2e4bf4193b0a 100644 --- a/web/content/docs/devguide/advanced/offline-build/index.md +++ b/web/content/docs/devguide/advanced/offline-build/index.md @@ -55,24 +55,24 @@ Extract the external dependencies cache into a directory. Configure OGS as usual cmake --preset release -DOGS_EXTERNAL_DEPENDENCIES_CACHE=./path/to/ext ``` -## Example for OpenGeoSys 6.4.3 (bugfix-branch) +## Example for OpenGeoSys 6.5.1 On a machine with internet access download the tarballs: ```bash -wget https://gitlab.opengeosys.org/ogs/ogs/-/archive/v6.4.3/ogs-v6.4.3.tar.gz -wget -O cpm.tar.gz https://gitlab.opengeosys.org/ogs/ogs/-/package_files/193/download -wget -O ext.tar.gz https://gitlab.opengeosys.org/ogs/ogs/-/package_files/120/download +wget https://gitlab.opengeosys.org/ogs/ogs/-/archive/6.5.1/ogs-6.5.1.tar.gz +wget -O cpm.tar.gz https://gitlab.opengeosys.org/ogs/ogs/-/package_files/1048/download +wget -O ext.tar.gz https://gitlab.opengeosys.org/ogs/ogs/-/package_files/1245/download ``` Copy those file onto the machine where you want to build OGS. Then build OGS offline: ```bash -tar xf ogs-v6.4.3.tar.gz +tar xf ogs-6.5.1.tar.gz tar xf cpm.tar.gz tar xf ext.tar.gz -cd ogs-v6.4.3 -OGS_VERSION=6.4.3 cmake --preset release -DCPM_SOURCE_CACHE=../cpm -DOGS_EXTERNAL_DEPENDENCIES_CACHE=../ext +cd ogs-6.5.1 +OGS_VERSION=6.5.1 cmake --preset release -DCPM_SOURCE_CACHE=../cpm -DOGS_EXTERNAL_DEPENDENCIES_CACHE=../ext cmake --build --preset release ``` diff --git a/web/layouts/releases/list.html b/web/layouts/releases/list.html index b77447ffee0e8063a4f475b998ce3ed86fb24c9c..5bcda35ee7058cc1bfd9ac4d9ff05815d34dbfab 100644 --- a/web/layouts/releases/list.html +++ b/web/layouts/releases/list.html @@ -48,27 +48,6 @@ <hr> {{ range first 1 .Data.Pages }} - {{ $vtag := (print "v" .Params.tag ) }} - <h1 id="bugfixes">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/-/compare/{{ .Params.tag }}...{{ $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 after 1 $.Params.head_downloads }} <!-- skip pip download --> - <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>