Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
argo
aml
Commits
9b41ec63
Commit
9b41ec63
authored
May 06, 2020
by
Swann Perarnau
Browse files
Merge branch 'nix-shell' into 'staging'
Provide a nix shell for the repository See merge request
!132
parents
81d33817
0bcbcd46
Pipeline
#10380
passed with stages
in 4 minutes and 1 second
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
9b41ec63
...
...
@@ -35,7 +35,7 @@ clang-format:
script
:
-
rm -f clang-format-diff
-
target=$(git rev-parse $DEFAULT_MERGE_TARGET)
-
nix-shell
"$ARGOPKGS" -A ci.aml-format
--run "git-clang-format --quiet --diff $target > clang-format-diff"
-
nix-shell --run "git-clang-format --quiet --diff $target > clang-format-diff"
-
lint=$(grep -v --color=never "no modified files to format" clang-format-diff ||
true
)
-
if [ ! -z "$lint" ]; then echo "format errors, inspect the clang-format-diff artifact for info"; exit 1; else exit 0; fi
artifacts
:
...
...
@@ -54,7 +54,7 @@ style:docs:
-
kvm
script
:
-
|
nix-shell
"$ARGOPKGS" -A aml-dist --arg aml-src ./.
--run bash <<< '
nix-shell --run bash <<< '
./autogen.sh
mkdir build
./configure --prefix=`pwd`/build --enable-docs
...
...
@@ -77,7 +77,7 @@ make:generic:
CFLAGS
:
"
-std=c99
-pedantic
-Wall
-Wextra
-Werror
-Wno-unused-but-set-parameter"
script
:
-
|
nix-shell
"$ARGOPKGS" -A aml --arg aml-src ./.
--run bash <<< '
nix-shell --run bash <<< '
./autogen.sh
mkdir build
./configure --prefix=`pwd`/build
...
...
@@ -103,7 +103,7 @@ make:out-of-tree:
CFLAGS
:
"
-std=c99
-pedantic
-Wall
-Wextra
-Werror
-Wno-unused-but-set-parameter"
script
:
-
|
nix-shell
"$ARGOPKGS" -A aml --arg aml-src ./.
--run bash <<< '
nix-shell --run bash <<< '
./autogen.sh
mkdir out
cd out
...
...
shell.nix
0 → 100644
View file @
9b41ec63
# development shell, includes aml dependencies and dev-related helpers
# defined by argopkgs nix pkg record
{
pkgs
?
import
(
builtins
.
fetchTarball
"https://xgitlab.cels.anl.gov/argo/argopkgs/-/archive/master/argopkgs-master.tar.gz"
)
{}
}:
with
pkgs
;
pkgs
.
mkShell
{
name
=
"aml"
;
nativeBuildInputs
=
[
autoreconfHook
pkgconfig
];
buildInputs
=
[
# dependencies for the code
hwloc
numactl
# deps for docs
graphviz
doxygen
python3Packages
.
sphinx
python3Packages
.
breathe
python3Packages
.
sphinx_rtd_theme
# deps for debug
gdb
valgrind
# style checks
(
clang-tools
.
override
(
o
:{
llvmPackages
=
pkgs
.
llvmPackages_7
;}))
llvmPackages_7
.
clang-unwrapped
.
python
];
CFLAGS
=
"-std=c99 -pedantic -Wall -Wextra -Werror -Wno-unused-but-set-parameter -Wno-builtin-declaration-mismatch"
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment