diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31e8ec7b42d4ae38c439ccb8f1b5e7ae2d2feca8..e7270d2b3a41543e7880f024fd25a98b177f3688 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ stages: - #- build + - build - test #make:generic: @@ -16,11 +16,22 @@ stages: #except: #- /^wip.*/ #- /^WIP.*/ + # + +libnrm.build: + stage: build + script: + - nix-build .integration.nix -A libnrm + except: + - /^wip\/.*/ + - /^WIP\/.*/ + tags: + - integration helloworld.integration.test: stage: test script: - - nix-shell .integration.nix --run "argotk.hs helloworld" + - nix-shell .integration.nix -A test --run "argotk.hs helloworld" artifacts: paths: - _output/cmd_err.log @@ -39,7 +50,7 @@ helloworld.integration.test: perfwrapper.integration.test: stage: test script: - - nix-shell .integration.nix --run "argotk.hs perfwrapper" + - nix-shell .integration.nix -A test --run "argotk.hs perfwrapper" artifacts: paths: - _output/cmd_err.log diff --git a/.integration.nix b/.integration.nix index b760650cccba5ed87906a5972f9b7362fed085cd..34e6cca984d527749e27caf2298dcaacde91695a 100644 --- a/.integration.nix +++ b/.integration.nix @@ -1,7 +1,7 @@ { argotest ? (builtins.fetchGit { url = https://xgitlab.cels.anl.gov/argo/argotest.git; ref="master"; - rev="646d42f7b64f56cdb3ff54a7b4a59e0dfad3209c"; + rev="2589756882a96dee624f4ed420510b720a85f2b0"; }) }: (import argotest { @@ -11,4 +11,4 @@ ref="downstream-refactor"; rev="37f5594287f77e42f3bf5f6b5a89f387c8905137"; }; -}).test +})