From 7a529369ae3c13b3d25c082b65c11eedf1a61171 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Mon, 28 Aug 2023 16:05:47 +0200 Subject: [PATCH 1/3] [ci,guix] Update dependency repo. --- ThirdParty/collection | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ThirdParty/collection b/ThirdParty/collection index c47c2ed91cd..d57a65125b9 160000 --- a/ThirdParty/collection +++ b/ThirdParty/collection @@ -1 +1 @@ -Subproject commit c47c2ed91cdfba1f46f62be2f25ccb8223ec125d +Subproject commit d57a65125b9693556de26e1c47d8da7c5d3e776c From 57eb3171dd7d2ac0dcac3e4d72cfed1e39623146 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Mon, 28 Aug 2023 16:06:22 +0200 Subject: [PATCH 2/3] [conan] Fixed repo url. --- scripts/cmake/ConanSetup.cmake | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 18932c2ccd8..c2ca69a7c06 100644 --- 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 From de4cfc6c749f3d1f99b70e0e6538e84ac8a27162 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Mon, 28 Aug 2023 16:06:35 +0200 Subject: [PATCH 3/3] [web] Fixed links. --- web/content/docs/devguide/environments/docker/index.md | 2 +- .../docs/devguide/packages/conan-package-manager/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/content/docs/devguide/environments/docker/index.md b/web/content/docs/devguide/environments/docker/index.md index dca9e767bce..e14f72e196f 100644 --- 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 index 19f4e11d9f5..9b41081f4eb 100644 --- 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 . 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