Skip to content

Commit

Permalink
Merge pull request #219 from lanl/jmm/no-static-on-re-git
Browse files Browse the repository at this point in the history
no static on re git
  • Loading branch information
Yurlungur authored Jan 18, 2023
2 parents ec14357 + f5b09b4 commit f893b41
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 60 deletions.
57 changes: 0 additions & 57 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
###################

stages:
- static_analysis
- build_n_test

variables:
Expand Down Expand Up @@ -104,35 +103,6 @@ before_script:
# Job Script Template #
#######################

.clang-format:
stage: static_analysis
variables:
GIT_SUBMODULE_STRATEGY: none
script:
- cd ${CI_PROJECT_DIR}
- spack install --show-log-on-error --no-checksum --yes-to-all singularity-eos+mpi+format%gcc@${SINGULARITY_EOS_GCC_VERSION}^openmpi@${SINGULARITY_EOS_OPENMPI_VERSION}
- spack module tcl refresh -y
- spack env loads -r -x singularity-eos
- source ${CI_PROJECT_DIR}/spack/share/spack/setup-env.sh
- source ${CI_PROJECT_DIR}/spack_env/loads
- clang-format -version
- find ${CI_PROJECT_DIR} -regex '.*\.\(cpp\|hpp\)' | xargs clang-format -style=file -i && git diff --exit-code --ignore-submodules

.sphinx-doc:
stage: static_analysis
variables:
GIT_SUBMODULE_STRATEGY: none
script:
- spack install --show-log-on-error --no-checksum --yes-to-all singularity-eos+python+mpi+doc%gcc@${SINGULARITY_EOS_GCC_VERSION}^openmpi@${SINGULARITY_EOS_OPENMPI_VERSION}
- spack module tcl refresh -y
- spack env loads -r -x singularity-eos
- source ${CI_PROJECT_DIR}/spack/share/spack/setup-env.sh
- source ${CI_PROJECT_DIR}/spack_env/loads
- cd ${CI_PROJECT_DIR}/doc/sphinx
- make html
- rm -rf ${CI_PROJECT_DIR}/public
- mv _build/html ${CI_PROJECT_DIR}/public

.test:
stage: build_n_test
extends:
Expand Down Expand Up @@ -190,33 +160,6 @@ before_script:
# Jobs #
########

format:
<<: *job_def
extends: .clang-format
allow_failure: true

pages_check:
<<: *job_def
extends: .sphinx-doc
only:
refs:
- merge_requests
- pipelines
except:

pages:
<<: *job_def
extends: .sphinx-doc
artifacts:
paths:
- public
only:
refs:
- main
except:
refs:
- pipelines

test_gnu_skylake:
<<: *job_def
extends: .test
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- [[PR214]](https://github.com/lanl/singularity-eos/pull/214) added documentation about adding a new EOS

### Changed (changing behavior/API/variables/...)
- [[PR219]](https://github.com/lanl/singularity-eos/pull/219) Removed static analysis from re-git pipeline

### Infrastructure (changes irrelevant to downstream codes)
- [[PR190]](https://github.com/lanl/singularity-eos/pull/190) update CI on re-git
Expand Down
4 changes: 1 addition & 3 deletions doc/sphinx/src/sphinx-doc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@ at the bottom of the pull request page. If this passes, your documentation will
On the bottom left of the documentation page on `github-pages`_, you can select the branch/build
of the documentation, one of which should be the branch you wrote your changes on.

Documentation is available on `github-pages`_ and on `re-git`_
Documentation is available on `github-pages`_.

.. _Github Singularity-EOS: https://github.com/lanl/singularity-eos

.. _github-pages: https://lanl.github.io/singularity-eos/

.. _re-git: http://xcap.re-pages.lanl.gov/oss/singularity-eos

Building documentation locally
------------------------------

Expand Down

0 comments on commit f893b41

Please sign in to comment.