From 0877c8c4a027b99c947b30b6267b425ee6fd0d67 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 18 Jun 2024 13:07:24 +0200
Subject: [PATCH] [ci,guix] Update channel and use renamed ogs-serial package.
Somehow this works around duplicated image size...
---
scripts/ci/jobs/build-guix.yml | 10 +++++-----
scripts/guix/channels.scm | 2 +-
web/content/docs/devguide/advanced/guix/index.md | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/scripts/ci/jobs/build-guix.yml b/scripts/ci/jobs/build-guix.yml
index ae474bd7501..45dcb7771a8 100644
--- a/scripts/ci/jobs/build-guix.yml
+++ b/scripts/ci/jobs/build-guix.yml
@@ -23,11 +23,11 @@ build guix:
# SteadyStateDiffusion only!
- |
if [[ "$CI_MERGE_REQUEST_LABELS" =~ .*ci::guix\ only.* ]]; then
- guix time-machine -C scripts/guix/channels.scm -- build ogs --with-source=ogs@6.5.0-testing=$PWD
- guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc --with-source=ogs-petsc@6.5.0-testing=$PWD
+ guix time-machine -C scripts/guix/channels.scm -- build ogs-serial --with-source=ogs=$PWD
+ guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc --with-source=ogs-petsc=$PWD
else
- guix time-machine -C scripts/guix/channels.scm -- build ogs-ssd --with-source=ogs-ssd@6.5.0-testing=$PWD
- guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc-ssd --with-source=ogs-petsc-ssd@6.5.0-testing=$PWD
+ guix time-machine -C scripts/guix/channels.scm -- build ogs-ssd --with-source=ogs-ssd=$PWD
+ guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc-ssd --with-source=ogs-petsc-ssd=$PWD
fi
deploy container:
@@ -42,7 +42,7 @@ deploy container:
- if: $CI_COMMIT_TAG
parallel:
matrix:
- - GUIX_PACKAGE: ["ogs", "ogs-petsc", "ogs-mkl", "ogs-petsc-mkl"]
+ - GUIX_PACKAGE: ["ogs-serial", "ogs-petsc", "ogs-mkl", "ogs-petsc-mkl"]
script:
- which guix
- guix describe
diff --git a/scripts/guix/channels.scm b/scripts/guix/channels.scm
index 231fc80112a..75de28c6540 100644
--- a/scripts/guix/channels.scm
+++ b/scripts/guix/channels.scm
@@ -2,7 +2,7 @@
(name 'guix-ogs)
(url "https://gitlab.opengeosys.org/ogs/inf/guix-ogs.git")
(branch "master")
- (commit "a87da0ffacbfd5e9a4d43d3f61d0722bd66b5237"))
+ (commit "ccd0acb89265cc743c534bd6326cb76ed802e732"))
(channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
diff --git a/web/content/docs/devguide/advanced/guix/index.md b/web/content/docs/devguide/advanced/guix/index.md
index 58dcb39beeb..2931419f053 100644
--- a/web/content/docs/devguide/advanced/guix/index.md
+++ b/web/content/docs/devguide/advanced/guix/index.md
@@ -28,7 +28,7 @@ The package definitions for OGS are defined in [this repo](https://gitlab.openge
```bash
# builds ogs serial config
guix time-machine -C scripts/guix/channels.scm -- \
- build ogs --with-source=ogs@6.4.4-testing=$PWD
+ build ogs-serial --with-source=ogs@6.4.4-testing=$PWD
# SteadyStateDiffuion process only:
guix time-machine -C scripts/guix/channels.scm -- \
build ogs-ssd --with-source=ogs-ssd@6.4.4-testing=$PWD
@@ -40,7 +40,7 @@ guix time-machine -C scripts/guix/channels.scm -- \
The version string starting after `@` can be set individually. To get the dependency tree:
```bash
-guix time-machine -C scripts/guix/channels.scm -- graph ogs | dot -Tpdf > dag.pdf
+guix time-machine -C scripts/guix/channels.scm -- graph ogs-serial | dot -Tpdf > dag.pdf
```
### From web URL
@@ -55,7 +55,7 @@ guix time-machine -C ./channels.scm -- build ogs \
```bash
guix time-machine -C scripts/guix/channels.scm -- \
- shell --container --nesting --network --development ogs \ # OR ogs-petsc
+ shell --container --nesting --network --development ogs-serial \ # OR ogs-petsc
openssl nss-certs coreutils bash git
# Now in guix shell with all dependencies installed:
export CMAKE_PRESET_BUILD_DIR_PREFIX=guix/ # presets then create e.g. ../build/guix/release
@@ -66,7 +66,7 @@ cmake --build --preset release
As a shortcut you can use this script:
```bash
-./scripts/guix/ogs-env.sh ogs # for serial or `ogs-petsc` for parallel
+./scripts/guix/ogs-env.sh ogs-serial # or `ogs-petsc` for parallel
```
You can also play with e.g. different versions of dependencies, here changing OpenMPI to 4.1.6:
--
GitLab