Skip to content

Commit

Permalink
Merge branch 'fix-ci' into 'master'
Browse files Browse the repository at this point in the history
[ci] Fixed guix job output directory.

See merge request ogs/ogs!4832
  • Loading branch information
bilke committed Dec 7, 2023
2 parents 153dadf + 52fe3bb commit 7901bef
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions scripts/ci/jobs/build-guix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]=$PWD | tee | tail -1 )
- image=$( guix time-machine -C scripts/guix/channels.scm -- pack --no-substitutes -RR --format=squashfs bash coreutils ogs-petsc [email protected]=$PWD | tee | tail -1 )
- echo "Image $image"
- ssh [email protected] rm -f ${GUIX_PETSC_CONTAINER}
- scp $image [email protected]:${GUIX_PETSC_CONTAINER}
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion web/content/docs/userguide/basics/introduction/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<div class='win'>

Expand Down

0 comments on commit 7901bef

Please sign in to comment.