diff --git a/.github/workflows/build_external_lib.yml b/.github/workflows/build_external_lib.yml index 8f2725ea4c..b3a01b8a89 100644 --- a/.github/workflows/build_external_lib.yml +++ b/.github/workflows/build_external_lib.yml @@ -14,7 +14,7 @@ jobs: build-deps: runs-on: ubuntu-22.04 - + strategy: matrix: compiler: [ gnu, clang ] @@ -35,17 +35,17 @@ jobs: cd build NETCDF_PATH=/usr MODERN=YES NUMPROCS=2 COMPILER=${{ matrix.compiler }} INSTALL_PATH=${HOME} bash ../cmake-config - - name: Build + - name: Build shell: bash -l {0} run: | - cd build + cd build make -j 4 if: ${{ success() }} - name: Install shell: bash -l {0} run: | - cd build + cd build make -j 4 install if: ${{ success() }} diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 584b4050ad..121ca66d66 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -13,7 +13,7 @@ jobs: build-deps: runs-on: ubuntu-latest - + strategy: matrix: compiler: [ gnu, clang, mpi ] @@ -51,7 +51,7 @@ jobs: ### seacas-build: - + needs: build-deps runs-on: ubuntu-latest @@ -91,17 +91,17 @@ jobs: cd build NUMPROCS=2 COMPILER=${{ matrix.compiler }} INSTALL_PATH=${HOME}/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config - - name: Build + - name: Build shell: bash -l {0} run: | - cd build + cd build make -j 4 if: ${{ success() }} - name: Install shell: bash -l {0} run: | - cd build + cd build make -j 4 install if: ${{ success() }} diff --git a/.github/workflows/build_variant.yml b/.github/workflows/build_variant.yml index 71baafd545..dacdcfdbeb 100644 --- a/.github/workflows/build_variant.yml +++ b/.github/workflows/build_variant.yml @@ -15,7 +15,7 @@ jobs: build-deps: runs-on: ubuntu-latest - + strategy: matrix: compiler: [ gnu, clang, mpi ] @@ -60,7 +60,7 @@ jobs: hdf5: [ V110 ] netcdf: [ 4.9.2 ] cgns: [ 4.3.0 ] - config: + config: - { name: "Debug serial build", os: ubuntu-latest, @@ -268,7 +268,7 @@ jobs: set -x COMPILER=${{ matrix.config.compiler }} KOKKOS=${{ matrix.config.use_kokkos }} ADIOS2=${{ matrix.config.use_adios2 }} CATALYST2=${{ matrix.config.use_catalyst2 }} GNU_PARALLEL=OFF GTEST=${{ matrix.config.gtest }} INSTALL_PATH=${HOME}/environments/${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} ./install-tpl.sh ls ${HOME} && ls ${HOME}/environments && ls ${HOME}/environments/${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} && ls ${HOME}/environments/${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}/lib - + ### # Configure and build ### @@ -280,17 +280,17 @@ jobs: cd build NUMPROCS=2 ${{ matrix.config.extra }} THREADSAFE=${{ matrix.config.threadsafe }} DEBUG=${{ matrix.config.debug }} FORTRAN=${{ matrix.config.fortran }} SANITIZER=${{ matrix.config.sanitizer }} COMPILER=${{ matrix.config.compiler }} INSTALL_PATH=${HOME}/environments/${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config - - name: Build + - name: Build shell: bash -l {0} run: | - cd build + cd build make -j 4 if: ${{ success() }} - name: Install shell: bash -l {0} run: | - cd build + cd build make -j 4 install if: ${{ success() }} @@ -298,7 +298,7 @@ jobs: shell: bash -l {0} run: | cd build - ctest -j 4 --output-on-failure + ctest -j 4 --output-on-failure if: ${{ success() && matrix.config.sanitizer == 'NO' && matrix.config.threadsafe == 'NO' }} - name: Run sanitized/threadsafe Tests diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 93e6779d54..e3b633a02f 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -8,7 +8,7 @@ jobs: build-deps: runs-on: ubuntu-latest - + strategy: matrix: compiler: [ gnu ] @@ -46,7 +46,7 @@ jobs: ### seacas-build: - + needs: build-deps runs-on: ubuntu-latest @@ -94,10 +94,10 @@ jobs: cd build ZOLTAN=NO INSTALL_PATH=${HOME}/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config coverity - - name: Build + - name: Build shell: bash -l {0} run: | - cd build + cd build mkdir cov-int ../cov-analysis-linux64/bin/cov-build --dir cov-int make -j 4 if: ${{ success() }} diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index 8933b094ee..08f301f490 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -12,7 +12,7 @@ jobs: build-deps: runs-on: ubuntu-latest - + strategy: matrix: compiler: [ intel, mpi ] @@ -36,12 +36,12 @@ jobs: - name: install run: | sudo apt-get install -y intel-oneapi-common-vars - sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic + sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic sudo apt-get install -y intel-oneapi-compiler-fortran - sudo apt-get install -y intel-oneapi-mpi - sudo apt-get install -y intel-oneapi-mpi-devel - sudo apt-get install -y intel-oneapi-mkl - sudo apt-get install -y ninja-build + sudo apt-get install -y intel-oneapi-mpi + sudo apt-get install -y intel-oneapi-mpi-devel + sudo apt-get install -y intel-oneapi-mkl + sudo apt-get install -y ninja-build - name: Install System dependencies shell: bash -l {0} @@ -68,7 +68,7 @@ jobs: ls ${HOME} && ls ${HOME}/environments && ls ${HOME}/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} && ls ${HOME}/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}/lib seacas-build: - + needs: build-deps runs-on: ubuntu-latest @@ -91,12 +91,12 @@ jobs: - name: install run: | sudo apt-get install -y intel-oneapi-common-vars - sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic + sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic sudo apt-get install -y intel-oneapi-compiler-fortran - sudo apt-get install -y intel-oneapi-mpi - sudo apt-get install -y intel-oneapi-mpi-devel - sudo apt-get install -y intel-oneapi-mkl - sudo apt-get install -y ninja-build + sudo apt-get install -y intel-oneapi-mpi + sudo apt-get install -y intel-oneapi-mpi-devel + sudo apt-get install -y intel-oneapi-mkl + sudo apt-get install -y ninja-build - name: Install System dependencies shell: bash -l {0} @@ -133,17 +133,17 @@ jobs: printenv >> $GITHUB_ENV NUMPROCS=2 COMPILER=${{ matrix.compiler }} INSTALL_PATH=${HOME}/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config - - name: Build + - name: Build shell: bash -l {0} run: | - cd build + cd build make -j 4 if: ${{ success() }} - name: Install shell: bash -l {0} run: | - cd build + cd build make -j 4 install if: ${{ success() }} diff --git a/.github/workflows/python-linting.yml b/.github/workflows/python-linting.yml index 7f04605b84..a5cbb8046c 100644 --- a/.github/workflows/python-linting.yml +++ b/.github/workflows/python-linting.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up Python + - name: Set up Python uses: actions/setup-python@v4 with: python-version: '3.10' diff --git a/.github/workflows/trailing.yml b/.github/workflows/trailing.yml index b94693e2aa..2fd3c7bd34 100644 --- a/.github/workflows/trailing.yml +++ b/.github/workflows/trailing.yml @@ -1,5 +1,5 @@ name: CI Formatting -on: +on: workflow_dispatch: jobs: diff --git a/.lgtm.yml b/.lgtm.yml index 2836d9f13f..77ef2cf780 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -11,7 +11,7 @@ path_classifiers: extraction: cpp: prepare: - packages: + packages: - hdf5 - netcdf configure: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aab8a3132f..5e3bf42734 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,10 +4,10 @@ * Sign on (via web) to https://github.com/sandialabs/seacas * Make sure you are signed in to github * Click on the 'Fork' button near the top right of the page. -* Clone your fork of seacas with +* Clone your fork of seacas with * `git clone git@github.com:/seacas`. * Or: `git clone https://github.com//seacas` -* Each time you clone your fork, +* Each time you clone your fork, * `git remote add upstream git@github.com:sandialabs/seacas` to add the original seacas repository as the `upstream` remote. * Or: `git remote add upstream https://github.com/sandialabs/seacas' diff --git a/README.Coverity b/README.Coverity index cc3bf29d40..0bcd132936 100644 --- a/README.Coverity +++ b/README.Coverity @@ -6,7 +6,7 @@ To trigger a scan by coverity, do the following: * make a change such that you can do a commit * Commit and then push -This should fire off a run of coverity scan. +This should fire off a run of coverity scan. Do not make source code changes on the coverity_scan branch and don't merge the branch back into master since the .travis.yml file is @@ -15,5 +15,3 @@ different between the branch and master. Commits to coverity_scan branch will only trigger the coverity scan and won't do the normal build and test. Commits to master branch will do the normal clang and gcc builds and run tests. - -