From d08baece5f552967e682dcb9b370f42f06b8a54e Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Wed, 16 Dec 2020 14:28:51 +0000 Subject: [PATCH] Addressing comments from @paulromano. --- .github/workflows/ci.yml | 18 ++++-- .travis.yml | 60 ------------------- ...-before-script.sh => gha-before-script.sh} | 0 ...-install-dagmc.sh => gha-install-dagmc.sh} | 0 ...is-install-njoy.sh => gha-install-njoy.sh} | 0 ...tall-vectfit.sh => gha-install-vectfit.sh} | 0 .../ci/{travis-install.py => gha-install.py} | 0 .../ci/{travis-install.sh => gha-install.sh} | 0 tools/ci/{travis-script.sh => gha-script.sh} | 0 9 files changed, 13 insertions(+), 65 deletions(-) delete mode 100644 .travis.yml rename tools/ci/{travis-before-script.sh => gha-before-script.sh} (100%) rename tools/ci/{travis-install-dagmc.sh => gha-install-dagmc.sh} (100%) rename tools/ci/{travis-install-njoy.sh => gha-install-njoy.sh} (100%) rename tools/ci/{travis-install-vectfit.sh => gha-install-vectfit.sh} (100%) rename tools/ci/{travis-install.py => gha-install.py} (100%) rename tools/ci/{travis-install.sh => gha-install.sh} (100%) rename tools/ci/{travis-script.sh => gha-script.sh} (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3945f19d5..5088f283e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,8 +66,6 @@ jobs: - name: Environment Variables run: | - echo "OPENMC_CROSS_SECTIONS=$HOME/nndc_hdf5/cross_sections.xml" >> $GITHUB_ENV - echo "OPENMC_ENDF_DATA=$HOME/endf-b-vii.1" >> $GITHUB_ENV echo "MPI=${{ matrix.mpi }}" >> $GITHUB_ENV echo "PHDF5=${{ matrix.mpi }}" >> $GITHUB_ENV echo "OMP=${{ matrix.omp }}" >> $GITHUB_ENV @@ -90,16 +88,16 @@ jobs: shell: bash run: | echo "$HOME/NJOY2016/build" >> $GITHUB_PATH - $GITHUB_WORKSPACE/tools/ci/travis-install.sh + $GITHUB_WORKSPACE/tools/ci/gha-install.sh - name: before shell: bash - run: $GITHUB_WORKSPACE/tools/ci/travis-before-script.sh + run: $GITHUB_WORKSPACE/tools/ci/gha-before-script.sh - name: test shell: bash - run: $GITHUB_WORKSPACE/tools/ci/travis-script.sh + run: $GITHUB_WORKSPACE/tools/ci/gha-script.sh - name: after_success @@ -107,3 +105,13 @@ jobs: run: | cpp-coveralls -i src -i include --exclude-pattern "/usr/*" --dump cpp_cov.json coveralls --merge=cpp_cov.json + + finish: + needs: main + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.github_token }} + parallel-finished: true \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6eee7f742..000000000 --- a/.travis.yml +++ /dev/null @@ -1,60 +0,0 @@ - -sudo: required -dist: xenial -language: python -addons: - apt: - packages: - - mpich - - libmpich-dev - - libhdf5-serial-dev - - libhdf5-mpich-dev - - libeigen3-dev - config: - retries: true -services: - - xvfb -cache: - directories: - - $HOME/nndc_hdf5 - - $HOME/endf-b-vii.1 -env: - global: - - MPI_DIR=/usr - - DAGMC_ROOT=$HOME/DAGMC - - HDF5_ROOT=/usr - - OMP_NUM_THREADS=2 - - OPENMC_CROSS_SECTIONS=$HOME/nndc_hdf5/cross_sections.xml - - OPENMC_ENDF_DATA=$HOME/endf-b-vii.1 - - PATH=$PATH:$HOME/NJOY2016/build - - COVERALLS_PARALLEL=true - - NUMPY_EXPERIMENTAL_ARRAY_FUNCTION=0 -matrix: - include: - - python: "3.6" - env: OMP=n MPI=n PHDF5=n - - python: "3.7" - env: OMP=n MPI=n PHDF5=n - - python: "3.8" - env: OMP=n MPI=n PHDF5=n - - python: "3.8" - env: OMP=y MPI=n PHDF5=n - - python: "3.8" - env: OMP=n MPI=y PHDF5=n VECTFIT=y - - python: "3.8" - env: OMP=n MPI=y PHDF5=y - - python: "3.8" - env: OMP=y MPI=y PHDF5=y DAGMC=y - - python: "3.8" - env: OMP=y MPI=n PHDF5=n EVENT=y -notifications: - webhooks: https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN -install: - - ./tools/ci/travis-install.sh -before_script: - - ./tools/ci/travis-before-script.sh -script: - - ./tools/ci/travis-script.sh -after_success: - - cpp-coveralls -i src -i include --exclude-pattern "/usr/*" --dump cpp_cov.json - - coveralls --merge=cpp_cov.json diff --git a/tools/ci/travis-before-script.sh b/tools/ci/gha-before-script.sh similarity index 100% rename from tools/ci/travis-before-script.sh rename to tools/ci/gha-before-script.sh diff --git a/tools/ci/travis-install-dagmc.sh b/tools/ci/gha-install-dagmc.sh similarity index 100% rename from tools/ci/travis-install-dagmc.sh rename to tools/ci/gha-install-dagmc.sh diff --git a/tools/ci/travis-install-njoy.sh b/tools/ci/gha-install-njoy.sh similarity index 100% rename from tools/ci/travis-install-njoy.sh rename to tools/ci/gha-install-njoy.sh diff --git a/tools/ci/travis-install-vectfit.sh b/tools/ci/gha-install-vectfit.sh similarity index 100% rename from tools/ci/travis-install-vectfit.sh rename to tools/ci/gha-install-vectfit.sh diff --git a/tools/ci/travis-install.py b/tools/ci/gha-install.py similarity index 100% rename from tools/ci/travis-install.py rename to tools/ci/gha-install.py diff --git a/tools/ci/travis-install.sh b/tools/ci/gha-install.sh similarity index 100% rename from tools/ci/travis-install.sh rename to tools/ci/gha-install.sh diff --git a/tools/ci/travis-script.sh b/tools/ci/gha-script.sh similarity index 100% rename from tools/ci/travis-script.sh rename to tools/ci/gha-script.sh