Skip to content

Commit

Permalink
Merge pull request #1256 from dgreatwood/stdcppForDebTesting
Browse files Browse the repository at this point in the history
Make linux.yaml workflow work for debian:testing/clang
  • Loading branch information
kiplingw authored Oct 17, 2024
2 parents 6e3f769 + 3a9926f commit a9f63e9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
16 changes: 16 additions & 0 deletions .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,22 @@ jobs:
apt -y update
apt -y install $compiler meson pkg-config cmake rapidjson-dev libssl-dev netbase '?exact-name(libhowardhinnant-date-dev)' '?exact-name(libgmock-dev) (?version([1-9]\.[1-9][1-9]) | ?version([1-9]\.[2-9][0-9]))' '?exact-name(libcpp-httplib-dev)' libcurl4-openssl-dev git ca-certificates curl gpg gpgv gpg-agent lcov llvm-dev --no-install-recommends
# Periodically, debian:testing fails with clang, saying that
# libstdc++ cannot be found. In debian:testing/clang, normally
# libstdc++-dev is installed as a dependency of meson. In the
# situation where the build breaks, the meson dependency is
# different to the latest available libstdc++; for instance,
# installing meson dependencies might install
# libstdc++-13-dev, whereas apt has access to
# libstdc++-14-dev. In other situations, the meson dependency
# libstdc++-..-dev may be the same as the latest
# libstdc++-..-dev to which apt has access.
#
# To prevent the build breaking, we need to install the latest
# libstdc++-..-dev to which apt has access - not the N-1
# version which may be installed as a meson dependency.
if [ ${{ matrix.compiler }} = clang ] && [ ${{ matrix.os == 'debian:testing' }} ]; then libstdcpp_latest=$(apt-cache search "libstdc++" | grep "libstdc++-..-dev " | sort -r | head -c 16); libstdcpp_latest_fst9=$(echo "${libstdcpp_latest}" | head -c 9); libstdcpp_latest_lst3=$(echo "${libstdcpp_latest}" | tail -c 4 | head -c 3); if [ ${libstdcpp_latest_fst9} = "libstdc++" ] && [ ${libstdcpp_latest_lst3} = "dev" ]; then apt -y install ${libstdcpp_latest} --no-install-recommends; fi; fi
- name: Install dependencies (Red Hat)
if: contains(matrix.os, 'redhat')
run: |
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.8.20241014
0.4.9.20241016

0 comments on commit a9f63e9

Please sign in to comment.