From b8a700a03590457a6a71a35af3331fd2dffb5a6e Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Thu, 7 Dec 2023 09:24:07 +0100 Subject: [PATCH 1/3] [web] Fixed pipx link. --- web/content/docs/userguide/basics/introduction/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/content/docs/userguide/basics/introduction/index.md b/web/content/docs/userguide/basics/introduction/index.md index 85ec5b8bb3a..420507f78bf 100644 --- a/web/content/docs/userguide/basics/introduction/index.md +++ b/web/content/docs/userguide/basics/introduction/index.md @@ -97,7 +97,7 @@ not activated you may still use OGS, but either have to give the full path to `o virtual environment, or add this path to your `PATH`-environment. Moreover, `pip` may print instructions which directory needs to be added to the `PATH`. -You could also use [`pipx`](https://pypa.github.io/pipx/) for installation into an isolated environment. +You could also use [`pipx`](https://pipx.pypa.io/stable/) for installation into an isolated environment.
From 57bb418f51f8e1a961e58e6f1129de6ce0336ae0 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Thu, 7 Dec 2023 09:24:47 +0100 Subject: [PATCH 2/3] [ci] Fixed guix job output directory. Output was missing somehow. --- scripts/ci/jobs/build-guix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/jobs/build-guix.yml b/scripts/ci/jobs/build-guix.yml index f400ae91365..ac1a6b181ad 100644 --- a/scripts/ci/jobs/build-guix.yml +++ b/scripts/ci/jobs/build-guix.yml @@ -58,7 +58,7 @@ test guix container eve: - mkdir -p $work_dir - cp -r ${CI_PROJECT_DIR}/Tests/Data/EllipticPETSc $work_dir/ - export prj_file=${work_dir}/EllipticPETSc/cube_1e3_XDMF_np3.prj - - jid=$(sbatch --chdir=${work_dir} --job-name=test-guix-container --mem-per-cpu=1G --ntasks=3 --output=/work/%u/%x_%j.out --parsable --time=5 --partition=testing --wrap="srun apptainer exec ${GUIX_PETSC_CONTAINER} ogs ${prj_file}") + - jid=$(sbatch --chdir=${work_dir} --job-name=test-guix-container --mem-per-cpu=1G --ntasks=3 --output=${work_dir}/log.out --parsable --time=5 --partition=testing --wrap="srun apptainer exec ${GUIX_PETSC_CONTAINER} ogs ${prj_file} -o ${work_dir}") # - touch /work/$USER/ci_log_$jid.out # required on frontend1, tail -F does not recognize file created - while true; do grep "$jid" < <(squeue -hj "$jid") || break; sleep 10; done &> /dev/null & tail -F /work/$USER/test-guix-container_$jid.out --pid="$!" || true - exit_code=$(sacct -j $jid.0 --format=ExitCode --noheader | cut -d':' -f1) From 52fe3bbd2cd0cdde477914b35959e07bdaedd251 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Thu, 7 Dec 2023 09:25:34 +0100 Subject: [PATCH 3/3] [guix] Add coreutils to eve container. --- scripts/ci/jobs/build-guix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/jobs/build-guix.yml b/scripts/ci/jobs/build-guix.yml index ac1a6b181ad..959f4bfb951 100644 --- a/scripts/ci/jobs/build-guix.yml +++ b/scripts/ci/jobs/build-guix.yml @@ -41,7 +41,7 @@ deploy guix container eve: - which guix - guix describe # All processes. - - image=$( guix time-machine -C scripts/guix/channels.scm -- pack --no-substitutes -RR --format=squashfs bash ogs-petsc --with-source=ogs-petsc@6.4.4-testing=$PWD | tee | tail -1 ) + - image=$( guix time-machine -C scripts/guix/channels.scm -- pack --no-substitutes -RR --format=squashfs bash coreutils ogs-petsc --with-source=ogs-petsc@6.4.4-testing=$PWD | tee | tail -1 ) - echo "Image $image" - ssh sonjenk@frontend2.eve.ufz.de rm -f ${GUIX_PETSC_CONTAINER} - scp $image sonjenk@frontend2.eve.ufz.de:${GUIX_PETSC_CONTAINER}