Skip to content

Commit

Permalink
Remove trailing whitespace [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
gsjaardema committed May 1, 2023
1 parent d24ef48 commit 398891a
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 43 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build_external_lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build-deps:

runs-on: ubuntu-22.04

strategy:
matrix:
compiler: [ gnu, clang ]
Expand All @@ -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() }}

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
build-deps:

runs-on: ubuntu-latest

strategy:
matrix:
compiler: [ gnu, clang, mpi ]
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
###

seacas-build:

needs: build-deps
runs-on: ubuntu-latest

Expand Down Expand Up @@ -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() }}

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build_variant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
build-deps:

runs-on: ubuntu-latest

strategy:
matrix:
compiler: [ gnu, clang, mpi ]
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
hdf5: [ V110 ]
netcdf: [ 4.9.2 ]
cgns: [ 4.3.0 ]
config:
config:
- {
name: "Debug serial build",
os: ubuntu-latest,
Expand Down Expand Up @@ -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
###
Expand All @@ -280,25 +280,25 @@ 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() }}

- name: Run Non-sanitized Tests
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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/coverity-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build-deps:

runs-on: ubuntu-latest

strategy:
matrix:
compiler: [ gnu ]
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
###

seacas-build:

needs: build-deps
runs-on: ubuntu-latest

Expand Down Expand Up @@ -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() }}
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/intel-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build-deps:

runs-on: ubuntu-latest

strategy:
matrix:
compiler: [ intel, mpi ]
Expand All @@ -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}
Expand All @@ -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

Expand All @@ -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}
Expand Down Expand Up @@ -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() }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trailing.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: CI Formatting
on:
on:
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .lgtm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ path_classifiers:
extraction:
cpp:
prepare:
packages:
packages:
- hdf5
- netcdf
configure:
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]:<username>/seacas`.
* Or: `git clone https://github.com/<username>/seacas`
* Each time you clone your fork,
* Each time you clone your fork,
* `git remote add upstream [email protected]:sandialabs/seacas` to add the original seacas repository as the `upstream` remote.
* Or: `git remote add upstream https://github.com/sandialabs/seacas'

Expand Down
4 changes: 1 addition & 3 deletions README.Coverity
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.


0 comments on commit 398891a

Please sign in to comment.