Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Özgür Ozan Sen
ogs
Commits
0877c8c4
Commit
0877c8c4
authored
9 months ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[ci,guix] Update channel and use renamed ogs-serial package.
Somehow this works around duplicated image size...
parent
ad3c3036
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
scripts/ci/jobs/build-guix.yml
+5
-5
5 additions, 5 deletions
scripts/ci/jobs/build-guix.yml
scripts/guix/channels.scm
+1
-1
1 addition, 1 deletion
scripts/guix/channels.scm
web/content/docs/devguide/advanced/guix/index.md
+4
-4
4 additions, 4 deletions
web/content/docs/devguide/advanced/guix/index.md
with
10 additions
and
10 deletions
scripts/ci/jobs/build-guix.yml
+
5
−
5
View file @
0877c8c4
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
scripts/guix/channels.scm
+
1
−
1
View file @
0877c8c4
...
...
@@ -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"
)
...
...
This diff is collapsed.
Click to expand it.
web/content/docs/devguide/advanced/guix/index.md
+
4
−
4
View file @
0877c8c4
...
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment