Update master with changes from v2.0

CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [v1.0]
+
+### Added
+
+- The codecov bash script is hash-checked.
+
+### Changed
+
+- BREAKING CHANGE: `upload-coverage` requires lcov to be installed.
+- `upload-coverage` optionally takes a list of directories.
+- The coverage report generation process is inspired from LLNL/BLT and LLNL/Serac.
+
+### Removed
+
+### Fixed

build-hypre/action.yml

@@ -12,27 +12,43 @@
 name: build-hypre
 
 inputs:
-  hypre-url:
+  url:
     description: 'URL where to look for Hypre'
     required: false
     default: 'https://github.com/hypre-space/hypre/archive'
-  hypre-archive:
+  archive:
     description: 'Archive to download'
     required: true
-  hypre-dir:
+  dir:
     description: 'Hypre top directory name'
     required: true
+  target:
+    description: 'A key to identify the desired hypre config (int32, int64)'
+    required: false
+    default: int32
 
 runs:
   using: "composite"
   steps:
     - name: Install Hypre
       run: |
-        wget --no-verbose ${{ inputs.hypre-url }}/${{ inputs.hypre-archive }};
-        rm -rf ${{ inputs.hypre-dir }};
-        tar -xzf ${{ inputs.hypre-archive }};
-        cd ${{ inputs.hypre-dir }}/src;
-        ./configure --disable-fortran CC=mpicc CXX=mpic++;
+        echo "Map target to options"
+        if [[ "${{ inputs.target }}" == "int32" ]]
+        then
+          export hypre_options="--disable-fortran";
+        elif [[ "${{ inputs.target }}" == "int64" ]]
+        then
+          export hypre_options="--disable-fortran --enable-bigint";
+        else
+          echo "Hypre target not recognized";
+          exit 1;
+        fi
+        echo "Installing Hypre"
+        wget --no-verbose ${{ inputs.url }}/${{ inputs.archive }};
+        rm -rf ${{ inputs.dir }};
+        tar -xzf ${{ inputs.archive }};
+        cd ${{ inputs.dir }}/src;
+        ./configure ${hypre_options} CC=mpicc CXX=mpic++;
         make -j3;
         cd ../..;
       shell: bash

build-metis/action.yml

@@ -12,14 +12,14 @@
 name: build-metis
 
 inputs:
-  metis-url:
+  url:
     description: 'URL where to look for Metis'
     required: false
     default: 'https://mfem.github.io/tpls'
-  metis-archive:
+  archive:
     description: 'Archive to download'
     required: true
-  metis-dir:
+  dir:
     description: 'Metis top directory name'
     required: true
 
@@ -28,8 +28,8 @@ runs:
   steps:
     - name: Install Metis
       run: |
-        wget --no-verbose ${{ inputs.metis-url }}/${{ inputs.metis-archive }};
-        rm -rf ${{ inputs.metis-dir }};
-        tar -xzf ${{ inputs.metis-archive }};
-        make -j3 -C ${{ inputs.metis-dir }}/Lib CC=mpicc OPTFLAGS="-Wno-error=implicit-function-declaration -O2";
+        wget --no-verbose ${{ inputs.url }}/${{ inputs.archive }};
+        rm -rf ${{ inputs.dir }};
+        tar -xzf ${{ inputs.archive }};
+        make -j3 -C ${{ inputs.dir }}/Lib CC=mpicc OPTFLAGS="-Wno-error=implicit-function-declaration -O2";
       shell: bash

build-mfem/action.yml

@@ -16,13 +16,13 @@ inputs:
     description: 'os'
     required: true
   target:
-    description: 'Type of target (debug, optim)'
+    description: 'Type of target (dbg, opt)'
     required: false
-    default: optim
+    default: opt
   mpi:
     description: 'MPI status'
     required: false
-    default: parallel
+    default: par
   codecov:
     description: 'Codecov status'
     required: false
@@ -71,23 +71,24 @@ runs:
         echo "-----------------------------"
         echo "--- Prepare Configuration ---"
         MPI="NO"
-        if [[ ${{ inputs.mpi }} == 'parallel' ]]; then
+        if [[ ${{ inputs.mpi }} == 'par' ]]; then
           MPI="YES"
           echo "[INFO] Hypre symlink: hypre -> ${{ inputs.hypre-dir }}"
           ln -s -f ${{ inputs.hypre-dir }} hypre;
           echo "[INFO] Metis symlink: metis -> ${{ inputs.metis-dir }}"
           ln -s -f ${{ inputs.metis-dir }} metis-4.0;
         fi
         echo "[STATUS] MPI: ${MPI}"
-        CPPFLAGS="";
-        DEBUG="NO";
+        CPPFLAGS=""
+        DEBUG="NO"
         BUILD_TYPE="Release"
-        if [[ ${{ inputs.target }} == 'debug' ]]; then
+        if [[ ${{ inputs.target }} == 'dbg' ]]; then
           DEBUG="YES";
           BUILD_TYPE="Debug";
-          if [[ ${{ inputs.os }} == 'ubuntu-18.04' ]]; then
-            CPPFLAGS+=" -pedantic -Wall -Werror";
-          fi
+        fi
+        if [[ ${{ runner.os }} != 'Linux' || \
+              ${{ inputs.target }} == 'dbg' ]]; then
+          CPPFLAGS+=" -pedantic -Wall -Werror";
         fi
         echo "[STATUS] DEBUG: ${DEBUG}"
         echo "[STATUS] BUILD_TYPE: ${BUILD_TYPE}"

upload-coverage/action.yml

@@ -10,7 +10,7 @@
 # CONTRIBUTING.md for details.
 
 name: Upload Coverage
-description: Upload coverage to codecov
+description: Upload coverage to codecov, requires lcov.
 
 inputs:
   name:
@@ -19,15 +19,36 @@ inputs:
   project_dir:
     description: "Path to the project directory"
     required: true
+  directories:
+    descripton: "List of directories to look for coverage info"
+    required: false
 
 runs:
   using: "composite"
 
   steps:
     - run: |
         cd ${{ inputs.project_dir }}
-        curl -o codecov.sh -f https://codecov.io/bash || \
-          curl -o codecov.sh -f https://codecov.io/bash || \
-          curl -o codecov.sh -f https://codecov.io/bash
-        bash codecov.sh -n "${{ inputs.name }}"
+        # Restrict search to directories listed, if any.
+        directory_list="${{ inputs.directories }}";
+        dirs_opts="";
+        if [[ -n "${directory_list}" ]]; then
+          for dir in ${directory_list}; do dirs_opts+=" --directory=${dir}"; done
+        fi
+        # Generate the coverage report.
+        lcov --no-external --gcov-tool gcov ${dirs_opts} --capture --output-file lcov.info;
+        # The variable $RUNNER_OS should be either "Linux" or "macOS"
+        os_lowercase=$(echo $RUNNER_OS | awk '{print tolower($0)}')
+        # The prefix will end with "linux" or "macos" depending on the runner OS
+        prefix="https://uploader.codecov.io/latest/$os_lowercase"
+        curl -Os "$prefix/codecov"
+        # Check integrity of the binary uploader (cf. https://docs.codecov.com/docs/codecov-uploader#integrity-checking-the-uploader)
+        curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import # One-time step
+        curl -Os "$prefix/codecov.SHA256SUM"
+        curl -Os "$prefix/codecov.SHA256SUM.sig"
+        gpgv codecov.SHA256SUM.sig codecov.SHA256SUM
+        shasum -a 256 -c codecov.SHA256SUM
+        # Run the uploader
+        chmod +x codecov
+        ./codecov -n "${{ inputs.name }}"
       shell: bash