From 564856fa8f7f3c370798c4426209ed9d44b6ad77 Mon Sep 17 00:00:00 2001 From: rs028 Date: Wed, 14 Aug 2024 15:45:17 +0100 Subject: [PATCH] Update github actions --- .github/workflows/ci.yml | 24 ++++++++++++++---------- .github/workflows/tex.yml | 6 +++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a005130d..2633247e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,11 +45,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12] - fortran: [9, 10, 11] - exclude: # TODO: gfortran-9 does not work on macos-12 - - os: macos-12 - fortran: 9 + os: [ubuntu-20.04, ubuntu-22.04] #, macos-12, macos-13] + fortran: [10, 11, 12] + # exclude: # TODO: gfortran-9 does not work on macos-12 + # - os: macos-12 + # fortran: 9 fail-fast: false # ------------------------------------------------------------- @@ -64,7 +64,7 @@ jobs: # ------------------------------------------------------------- # (1) Checkout the repository under $GITHUB_WORKSPACE - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout with: fetch-depth: 2 @@ -73,9 +73,13 @@ jobs: # and the AtChem2 dependencies: CVODE, openlibm, numdiff, FRUIT # gfortran on ubuntu - - name: Install gfortran-11 (ubuntu-20.04) - if: matrix.os == 'ubuntu-20.04' && matrix.fortran == 11 - run: sudo apt-get install gfortran-11 + # - name: Install gfortran-11 (ubuntu-20.04) + # if: matrix.os == 'ubuntu-20.04' && matrix.fortran == 11 + # run: sudo apt-get install gfortran-11 + + # - name: Install gfortran-12 (ubuntu-20.04) + # if: matrix.os == 'ubuntu-20.04' && matrix.fortran == 12 + # run: sudo apt-get install gfortran-12 # gfortran on macos - name: Install gfortran-9 (macos-11) @@ -155,6 +159,6 @@ jobs: - name: Upload coverage reports to Codecov if: matrix.os == 'ubuntu-22.04' && matrix.fortran == 11 - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 # https://github.com/marketplace/actions/codecov with: gcov: true diff --git a/.github/workflows/tex.yml b/.github/workflows/tex.yml index b75941b9..88eff090 100644 --- a/.github/workflows/tex.yml +++ b/.github/workflows/tex.yml @@ -45,7 +45,7 @@ jobs: # 1. Checkout the repository from the branch associated with the # current Pull Request - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout with: fetch-depth: 2 ref: ${{ github.ref }} @@ -58,7 +58,7 @@ jobs: # 2. Setup TeXLive and Inkscape (v1.x), then run the script to # generate the pdf file of the manual - name: Setup TexLive and compile the manual - uses: xu-cheng/texlive-action@v2 + uses: xu-cheng/texlive-action@v2 # https://github.com/marketplace/actions/github-action-with-texlive with: scheme: full run: | @@ -68,7 +68,7 @@ jobs: ./tools/make_manual_pdf.sh - name: Upload pdf file as artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v4 # https://github.com/marketplace/actions/upload-a-build-artifact with: name: AtChem2-Manual.pdf path: doc/AtChem2-Manual.pdf