Skip to content

N
nrm
Commit c7771b4a authored by Valentin Reis's avatar Valentin Reis
Browse files
Options

Merge branch 'ci-pointer' into 'master' 

[ci] moves CI back to `master` after a coordinated libnrm+nrm update.

See merge request !91
parents 9b2d4452 21c15ee5
Pipeline #7329 passed with stages
            in 34 minutes
            Hide whitespace changes
            Inline Side-by-side
            Showing with 6 additions and 6 deletions
            .gitlab-ci.yml
            View file @ c7771b4a
            --- ---
            variables: variables:
            ARGOPKGS: "https://xgitlab.cels.anl.gov/argo/argopkgs/-/archive/nrm-gen/argopkgs-nrm-gen.tar.gz" ARGOPKGS: "https://xgitlab.cels.anl.gov/argo/argopkgs/-/archive/master/argopkgs-master.tar.gz"
            EXTRA: "--nrm ./." EXTRA: "--nrm ./."
            stages: stages:
            ...@@ -11,11 +11,11 @@ stages: ...@@ -11,11 +11,11 @@ stages:
            - quality - quality
            include: include:
            - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/nrm-gen/gitlab-ci/argonix.yml - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/master/gitlab-ci/argonix.yml
            - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/nrm-gen/gitlab-ci/components.yml - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/master/gitlab-ci/components.yml
            - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/nrm-gen/gitlab-ci/integration.yml - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/master/gitlab-ci/integration.yml
            - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/nrm-gen/gitlab-ci/applications.yml - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/master/gitlab-ci/applications.yml
            - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/nrm-gen/gitlab-ci/repoquality.yml - https://xgitlab.cels.anl.gov/argo/argopkgs/raw/master/gitlab-ci/repoquality.yml
            py.test: py.test:
            stage: test stage: test
            ......
            Markdown is supported
            0% or
            You are about to add 0 people to the discussion. Proceed with caution.
            Finish editing this message first!
            Please register or to comment