fix(ci): revert to latest meson version (#185)

JeffersonLab · Apr 29, 2024 · fcf2680 · fcf2680
1 parent 99e0270
commit fcf2680
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.github/install-dependency-packages.sh b/.github/install-dependency-packages.sh
@@ -18,10 +18,12 @@ GENERAL_PACKAGE_LIST_LINUX=(
   which
   pkgconf
   ninja
-  # meson # FIXME: temporarly using ALA for older version
-  gcovr           # for coverage
-  python-pygments # for coverage report syntax colors
-  llvm            # for `llvm-symbolizer`, for human-readable sanitizer results
+  meson
+  llvm  # for `llvm-symbolizer`, for human-readable sanitizer results
+  ### coverage
+  python-colorlog
+  python-pygments
+  gcovr
   ### ROOT dependencies
   binutils
   libx11
@@ -114,10 +116,6 @@ case $runner in
       esac
       info_pacman $pkg
     done
-    ### FIXME: install older meson version
-    pacman -U --noconfirm https://archive.archlinux.org/packages/m/meson/meson-1.3.2-1-any.pkg.tar.zst
-    echo "MESON VERSION:"
-    meson --version
     ;;
 
   macos*)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -304,7 +304,8 @@ jobs:
       - name: coverage
         if: ${{ matrix.id == 'coverage' }}
         run: |
-          ninja -C iguana_build coverage
+          ninja -C iguana_build coverage-html
+          ninja -C iguana_build coverage-text
           mv iguana_build/meson-logs/coveragereport coverage-report
           echo '### Coverage Report' >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY