Update CI (#252)

- GitHub actions: Fix Environment Variables
See https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
- Linker language for Cray

Author: havogt

Diff for: .github/workflows/CI.yml

@@ -27,11 +27,11 @@ jobs:
       - name: Set defaults
         run: |
           export GCC_VERSION=$(echo ${{ matrix.compiler }} | cut -d'-' -f2)
-          echo "::set-env name=FC::gfortran-${GCC_VERSION}"
-          echo "::set-env name=TEST_FORTRAN::OFF"  # default will be overwritten in the next step
+          echo "FC=gfortran-${GCC_VERSION}" >> $GITHUB_ENV
+          echo "TEST_FORTRAN=OFF" >> $GITHUB_ENV  # default will be overwritten in the next step
       - name: Enable Fortran
         if: startsWith(matrix.compiler, 'gcc')
-        run: echo "::set-env name=TEST_FORTRAN::ON"
+        run: echo "TEST_FORTRAN=ON" >> $GITHUB_ENV
       - name: Install python modules
         run: pip3 install --user nose numpy
       - name: Cache pFUnit
@@ -62,11 +62,11 @@ jobs:
           message("::set-output name=timestamp::${current_date}")
       - name: Set ccache environment
         run: |
-          echo "::set-env name=CCACHE_MAXSIZE::400M"
-          echo "::set-env name=CCACHE_BASEDIR::$GITHUB_WORKSPACE"
-          echo "::set-env name=CCACHE_DIR::$GITHUB_WORKSPACE/.ccache"
-          echo "::set-env name=CCACHE_COMPRESS::true"
-          echo "::set-env name=CCACHE_COMPRESSLEVEL::6"
+          echo "CCACHE_MAXSIZE=400M" >> $GITHUB_ENV
+          echo "CCACHE_BASEDIR=$GITHUB_WORKSPACE" >> $GITHUB_ENV
+          echo "CCACHE_DIR=$GITHUB_WORKSPACE/.ccache" >> $GITHUB_ENV
+          echo "CCACHE_COMPRESS=true" >> $GITHUB_ENV
+          echo "CCACHE_COMPRESSLEVEL=6" >> $GITHUB_ENV
       - name: ccache cache files
         uses: actions/cache@v1
         with:

Diff for: examples/fortran/perturbation/CMakeLists.txt

@@ -31,16 +31,6 @@ find_package(Serialbox REQUIRED COMPONENTS Fortran)
 #
 add_definitions(-DSERIALIZE)
 
-#
-# Use the CXX linker with the cray compiler
-#
-set(example_linker_language "")
-if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Cray")
-    set(example_linker_language CXX)
-else()
-    set(example_linker_language Fortran)
-endif()
-
 #
 # Here we preprocess all the source files, using the preprocesser script pp_ser.py, and store them 
 # in ${PROJECT_SOURCE_DIR}/pp.
@@ -58,20 +48,19 @@ target_link_libraries(m_ser Serialbox::SerialboxFortranStatic)
 ## Producer
 add_executable(fortran_producer ${PP_OUTPUT}/main_producer.F90 )
 target_link_libraries(fortran_producer m_ser)
-set_target_properties(fortran_producer PROPERTIES LINKER_LANGUAGE ${example_linker_language})
+set_target_properties(fortran_producer PROPERTIES LINKER_LANGUAGE Fortran)
 
 ## Consumer
 add_executable(fortran_consumer ${PP_OUTPUT}/main_consumer.F90)
 target_link_libraries(fortran_consumer m_ser)
-set_target_properties(fortran_consumer PROPERTIES LINKER_LANGUAGE ${example_linker_language})
+set_target_properties(fortran_consumer PROPERTIES LINKER_LANGUAGE Fortran)
 
 ## Perturbed Consumer
 add_executable(fortran_consumer_perturb ${PP_OUTPUT}/main_consumer_perturb.F90)
 target_link_libraries(fortran_consumer_perturb m_ser)
-set_target_properties(fortran_consumer_perturb PROPERTIES LINKER_LANGUAGE ${example_linker_language})
+set_target_properties(fortran_consumer_perturb PROPERTIES LINKER_LANGUAGE Fortran)
 
 #
 # Finally, copy our run script to the build directory
 #
 file(COPY ${PROJECT_SOURCE_DIR}/run.sh DESTINATION ${PROJECT_BINARY_DIR})
-

Diff for: examples/fortran/perturbation_netcdf/CMakeLists.txt

@@ -35,16 +35,6 @@ endif()
 #
 add_definitions(-DSERIALIZE)
 
-#
-# Use the CXX linker with the cray compiler
-#
-set(example_linker_language "")
-if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Cray")
-    set(example_linker_language CXX)
-else()
-    set(example_linker_language Fortran)
-endif()
-
 #
 # Here we preprocess all the source files, using the preprocesser script pp_ser.py, and store them 
 # in ${PROJECT_SOURCE_DIR}/pp.
@@ -63,20 +53,19 @@ target_link_libraries(m_ser Serialbox::SerialboxFortranStatic)
 ## Producer
 add_executable(fortran_producer_netcdf ${PP_OUTPUT}/main_producer.F90)
 target_link_libraries(fortran_producer_netcdf m_ser)
-set_target_properties(fortran_producer_netcdf PROPERTIES LINKER_LANGUAGE ${example_linker_language})
+set_target_properties(fortran_producer_netcdf PROPERTIES LINKER_LANGUAGE Fortran)
 
 ## Consumer
 add_executable(fortran_consumer_netcdf ${PP_OUTPUT}/main_consumer.F90)
 target_link_libraries(fortran_consumer_netcdf m_ser)
-set_target_properties(fortran_consumer_netcdf PROPERTIES LINKER_LANGUAGE ${example_linker_language})
+set_target_properties(fortran_consumer_netcdf PROPERTIES LINKER_LANGUAGE Fortran)
 
 ## Perturbed Consumer
 add_executable(fortran_consumer_perturb_netcdf ${PP_OUTPUT}/main_consumer_perturb.F90)
 target_link_libraries(fortran_consumer_perturb_netcdf m_ser)
-set_target_properties(fortran_consumer_perturb_netcdf PROPERTIES LINKER_LANGUAGE ${example_linker_language})
+set_target_properties(fortran_consumer_perturb_netcdf PROPERTIES LINKER_LANGUAGE Fortran)
 
 #
 # Finally, copy our run script to the build directory
 #
 file(COPY ${PROJECT_SOURCE_DIR}/run.sh DESTINATION ${PROJECT_BINARY_DIR})
-

Diff for: examples/fortran/simple/CMakeLists.txt

@@ -14,21 +14,14 @@ target_link_libraries( simple_m_ser
                         ${CMAKE_THREAD_LIBS_INIT}
                         )
 target_include_directories(simple_m_ser PUBLIC ${PROJECT_BINARY_DIR}/src/serialbox-fortran)
-if(${CMAKE_Fortran_COMPILER_ID} STREQUAL "PGI" OR ${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
-    set_target_properties( simple_m_ser PROPERTIES LINKER_LANGUAGE Fortran)
-endif()
+set_target_properties( simple_m_ser PROPERTIES LINKER_LANGUAGE Fortran)
 
 add_executable(fortran_producer main_producer.F90)
 target_link_libraries(fortran_producer simple_m_ser)
 install(TARGETS fortran_producer DESTINATION bin)
-if(${CMAKE_Fortran_COMPILER_ID} STREQUAL "PGI" OR ${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
-    set_target_properties(fortran_producer PROPERTIES LINKER_LANGUAGE Fortran)
-endif()
+set_target_properties(fortran_producer PROPERTIES LINKER_LANGUAGE Fortran)
 
 add_executable(fortran_consumer main_consumer.F90)
 target_link_libraries(fortran_consumer simple_m_ser)
 install(TARGETS fortran_consumer DESTINATION bin)
-if(${CMAKE_Fortran_COMPILER_ID} STREQUAL "PGI" OR ${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
-    set_target_properties(fortran_consumer PROPERTIES LINKER_LANGUAGE Fortran)
-endif()
-
+set_target_properties(fortran_consumer PROPERTIES LINKER_LANGUAGE Fortran)