Merge branch 'ci-fixes' into 'master'

CI fixes See merge request ogs/ogs!4720
ufz · Aug 29, 2023 · 1032962 · 1032962
2 parents caaf1b4 + de4cfc6
commit 1032962
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/ThirdParty/collection b/ThirdParty/collection
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
@@ -29,11 +29,13 @@ set(CONAN_SYSTEM_INCLUDES ON)
 include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
 
 if(OGS_USE_NETCDF)
-    list(APPEND CONAN_REQUIRES
-         "netcdf/4.7.4#3af05a96c74c5ec03320790eb6aa8d2b"
-         "netcdf-cxx/4.3.1-3@bilke/testing#ca3ccf6c9a33aebdcaff7c5b8f493770"
-         "zlib/1.2.12#a30750797caa71bd61bd0a18189caa28"
-         "hdf5/1.12.1#71171442d15f19773a1c0cd7abe95988"
+    list(
+        APPEND
+        CONAN_REQUIRES
+        "netcdf/4.7.4#3af05a96c74c5ec03320790eb6aa8d2b"
+        "netcdf-cxx/4.3.1-3@bilke/testing#ca3ccf6c9a33aebdcaff7c5b8f493770"
+        "zlib/1.2.12#a30750797caa71bd61bd0a18189caa28"
+        "hdf5/1.12.1#71171442d15f19773a1c0cd7abe95988"
     )
     set(CONAN_OPTIONS netcdf:dap=False)
 endif()
@@ -73,7 +75,7 @@ if("${file_timestamp}" VERSION_LESS ${timestamp} OR DEFINED ENV{CI})
     # Speed up conan_add_remote
     set(CONAN_COMMAND ${CONAN_CMD} CACHE INTERNAL "")
     conan_add_remote(
-        NAME ogs INDEX 0 URL https://ogs.jfrog.io/ogs/api/conan/conan
+        NAME ogs INDEX 0 URL https://ogs.jfrog.io/artifactory/api/conan/conan
     )
     conan_add_remote(
         NAME bincrafters INDEX 1 URL

diff --git a/web/content/docs/devguide/environments/docker/index.md b/web/content/docs/devguide/environments/docker/index.md
@@ -23,7 +23,7 @@ See the [docs](https://docs.docker.com/get-docker/) for installation instruction
 
 ## Images
 
-Docker images can be created by [Dockerfiles](https://docs.docker.com/reference/builder/) which can be stacked and thus form a directed graph. OGS-6 image definitions are created with [`ufz/ogs-container-maker`](https://github.com/ufz/ogs-container-maker). Built images can be found at the [GitLab Container Registry](https://gitlab.opengeosys.org/ogs/ogs/container_registry). You can also [create images from your local source code](https://github.com/ufz/ogs-container-maker#build-ogs-from-local-git-repo).
+Docker images can be created by [Dockerfiles](https://docs.docker.com/engine/reference/builder/) which can be stacked and thus form a directed graph. OGS-6 image definitions are created with [`ufz/ogs-container-maker`](https://github.com/ufz/ogs-container-maker). Built images can be found at the [GitLab Container Registry](https://gitlab.opengeosys.org/ogs/ogs/container_registry). You can also [create images from your local source code](https://github.com/ufz/ogs-container-maker#build-ogs-from-local-git-repo).
 
 To build an image by yourself create a Dockerfile:
 

diff --git a/web/content/docs/devguide/packages/conan-package-manager/index.md b/web/content/docs/devguide/packages/conan-package-manager/index.md
@@ -24,7 +24,7 @@ The [Conan package manager](https://www.conan.io) helps to install all required
 
 ### Build packages locally
 
-Per default when Conan is enabled it will try to fetch prebuilt binaries from the [OGS Conan repository](https://ogs.jfrog.io/ogs/conan/) at <https://ogs.jfrog.io/ogs/api/conan/conan>. With the CMake option `OGS_CONAN_BUILD` you define what gets build locally. This option can be set to:
+Per default when Conan is enabled it will try to fetch prebuilt binaries from the [OGS Conan repository](https://ogs.jfrog.io/ogs/conan/). With the CMake option `OGS_CONAN_BUILD` you define what gets build locally. This option can be set to:
 
 - `missing` - Default, only builds packages which are not available as a prebuilt binary for the current configuration
 - `all` - Builds all packages locally