erge remote-tracking branch 'upstream/master' into level_logger

Author: jvdp1

.github/workflows/CI.yml

@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        gcc_v: [7, 8, 9] # Version of GFortran we want to use.
+        gcc_v: [7, 8, 9, 10] # Version of GFortran we want to use.
     env:
       FC: gfortran-${{ matrix.gcc_v }}
       GCC_V: ${{ matrix.gcc_v }}
@@ -73,14 +73,14 @@ jobs:
       working-directory: build
 
     - name: Test in-tree builds
-      if: contains( matrix.gcc_v, '9') # Only test one compiler on each platform
+      if: contains( matrix.gcc_v, '10') # Only test one compiler on each platform
       run: |
           cmake -DCMAKE_MAXIMUM_RANK=4 .
           cmake --build .
           cmake --build . --target test
 
     - name: Test manual makefiles
-      if: contains(matrix.os, 'ubuntu') && contains(matrix.gcc_v, '9')
+      if: contains(matrix.os, 'ubuntu') && contains(matrix.gcc_v, '10')
       run: |
         make -f Makefile.manual FYPPFLAGS="-DMAXRANK=4"
         make -f Makefile.manual test
@@ -121,7 +121,7 @@ jobs:
     - name: Install Intel oneAPI compiler
       if: contains(matrix.os, 'ubuntu')
       run: |
-        sudo apt-get install intel-oneapi-ifort
+        sudo apt-get install intel-oneapi-compiler-fortran
         source /opt/intel/oneapi/setvars.sh
         printenv >> $GITHUB_ENV
 

.github/workflows/doc-deployment.yml

@@ -20,19 +20,24 @@ env:
 jobs:
   Build-API-Docs:
     runs-on: macos-latest
+    env:
+      GCC_V: 10
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0 # Full history to get tag and commit info
       - name: Install GFortran macOS
-        run: brew install gcc || brew upgrade gcc || true
+        run: |
+          brew install gcc@${GCC_V} || brew upgrade gcc@${GCC_V} || true
+          brew link gcc@${GCC_V}
+          gfortran-${GCC_V} --version
       - name: Install Dependencies
         run: |
           pip3 install --prefer-binary --no-clean --disable-pip-version-check --progress-bar off lxml fypp
           brew install -f --force-bottle --keep-tmp ford
           type -a ford
           ford --version
-          gfortran --version
+          gfortran-${GCC_V} --version
       - name: Skip graph and search unless deploying
         if: github.ref != 'refs/heads/master' && ! startsWith( github.ref, 'refs/tags/' )
         run: |

src/tests/bitsets/test_stdlib_bitset_64.f90

@@ -147,13 +147,13 @@ subroutine test_io()
             'write_bitset'
 
         call set2 % from_string( bitstring_33 )
-        open( newunit=unit, file='test.txt', status='replace', &
+        open( newunit=unit, file='test64_1.txt', status='replace', &
             form='formatted', action='write' )
         call set2 % write_bitset(unit)
         call set1 % write_bitset(unit)
         call set0 % write_bitset(unit)
         close( unit )
-        open( newunit=unit, file='test.txt', status='old', &
+        open( newunit=unit, file='test64_1.txt', status='old', &
             form='formatted', action='read' )
         call set3 % read_bitset(unit)
         call set5 % read_bitset(unit)
@@ -169,13 +169,13 @@ subroutine test_io()
 
         close( unit )
 
-        open( newunit=unit, file='test.txt', status='replace', &
+        open( newunit=unit, file='test64_2.txt', status='replace', &
             form='formatted', action='write' )
         call set2 % write_bitset(unit, advance='no')
         call set1 % write_bitset(unit, advance='no')
         call set0 % write_bitset(unit)
         close( unit )
-        open( newunit=unit, file='test.txt', status='old', &
+        open( newunit=unit, file='test64_2.txt', status='old', &
             form='formatted', action='read' )
         call set3 % read_bitset(unit, advance='no')
         call set4 % read_bitset(unit, advance='no')

src/tests/bitsets/test_stdlib_bitset_large.f90

@@ -254,13 +254,13 @@ subroutine test_io()
             'write_bitset'
 
         call set2 % from_string( bitstring_33 )
-        open( newunit=unit, file='test.txt', status='replace', &
+        open( newunit=unit, file='test1.txt', status='replace', &
             form='formatted', action='write' )
         call set2 % write_bitset(unit)
         call set1 % write_bitset(unit)
         call set0 % write_bitset(unit)
         close( unit )
-        open( newunit=unit, file='test.txt', status='old', &
+        open( newunit=unit, file='test1.txt', status='old', &
             form='formatted', action='read' )
         call set3 % read_bitset(unit)
         call set5 % read_bitset(unit)
@@ -276,13 +276,13 @@ subroutine test_io()
         close( unit )
 
         call set12 % from_string( bitstring_33 // bitstring_33 )
-        open( newunit=unit, file='test.txt', status='replace', &
+        open( newunit=unit, file='test2.txt', status='replace', &
             form='formatted', action='write' )
         call set12 % write_bitset(unit)
         call set11 % write_bitset(unit)
         call set10 % write_bitset(unit)
         close( unit )
-        open( newunit=unit, file='test.txt', status='old', &
+        open( newunit=unit, file='test2.txt', status='old', &
             form='formatted', action='read' )
         call set13 % read_bitset(unit)
         call set15 % read_bitset(unit)
@@ -297,13 +297,13 @@ subroutine test_io()
 
         close( unit )
 
-        open( newunit=unit, file='test.txt', status='replace', &
+        open( newunit=unit, file='test3.txt', status='replace', &
             form='formatted', action='write' )
         call set2 % write_bitset(unit, advance='no')
         call set1 % write_bitset(unit, advance='no')
         call set0 % write_bitset(unit)
         close( unit )
-        open( newunit=unit, file='test.txt', status='old', &
+        open( newunit=unit, file='test3.txt', status='old', &
             form='formatted', action='read' )
         call set3 % read_bitset(unit, advance='no')
         call set4 % read_bitset(unit, advance='no')
@@ -319,13 +319,13 @@ subroutine test_io()
 
         close( unit )
 
-        open( newunit=unit, file='test.txt', status='replace', &
+        open( newunit=unit, file='test4.txt', status='replace', &
             form='formatted', action='write' )
         call set12 % write_bitset(unit, advance='no')
         call set11 % write_bitset(unit, advance='no')
         call set10 % write_bitset(unit)
         close( unit )
-        open( newunit=unit, file='test.txt', status='old', &
+        open( newunit=unit, file='test4.txt', status='old', &
             form='formatted', action='read' )
         call set13 % read_bitset(unit, advance='no')
         call set14 % read_bitset(unit, advance='no')