From 6609cc0ded1b3ccad3073d644f207ef43a734251 Mon Sep 17 00:00:00 2001 From: Jeremie Vandenplas Date: Fri, 18 Dec 2020 22:24:19 +0100 Subject: [PATCH 1/3] add gfortran 10 to CI --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3c7c1d953..6c4f9da5f 100644 --- a/.github/workflows/CI.yml +++ b/.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 }} From 896ef37d968c6aaed45ab983d4259ef73d605665 Mon Sep 17 00:00:00 2001 From: Jeremie Vandenplas Date: Fri, 18 Dec 2020 22:29:28 +0100 Subject: [PATCH 2/3] update CI for gfortran 10 --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6c4f9da5f..2c2e1b12a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -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 From 438e2cf36784f755ffccb0ee7516f1a4e43d8611 Mon Sep 17 00:00:00 2001 From: Jeremie Vandenplas Date: Fri, 18 Dec 2020 22:31:10 +0100 Subject: [PATCH 3/3] update doc-deployment.yml for gfortran 10 --- .github/workflows/doc-deployment.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/doc-deployment.yml b/.github/workflows/doc-deployment.yml index 1383b3443..69fc1dec8 100644 --- a/.github/workflows/doc-deployment.yml +++ b/.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: |