Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

no static on re git #219

Merged
merged 3 commits into from
Jan 18, 2023
+2 −60
Merged

no static on re git #219

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
967a272
no static analysis on re-git
jonahm-LANL Jan 18, 2023
01d52db
try
jonahm-LANL Jan 18, 2023
f5b09b4
Update CHANGELOG.md
Yurlungur Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 0 additions & 57 deletions .gitlab-ci.yml
View file
Open in desktop
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
4 changes: 1 addition & 3 deletions doc/sphinx/src/sphinx-doc.rst
View file
Open in desktop
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