From 2dce7761b1831fd3f82a9c2bd5476259d945da4d Mon Sep 17 00:00:00 2001 From: Nicholas Wilson Date: Tue, 4 Feb 2025 13:48:03 +0000 Subject: [PATCH] Backport of two CI build fixes --- .github/workflows/clang-analyzer.yml | 7 +++++++ .github/workflows/dev.yml | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/.github/workflows/clang-analyzer.yml b/.github/workflows/clang-analyzer.yml index d6b3da6a7..bfbb484bf 100644 --- a/.github/workflows/clang-analyzer.yml +++ b/.github/workflows/clang-analyzer.yml @@ -18,6 +18,13 @@ jobs: security-events: write contents: read + env: + # The @microsoft/sarif-multitool tool actually uses DotnetCore, which in + # turn aborts when it finds that GitHub's CI machine doesn't have ICU. + # Just turn off localisation. A future version of the ubuntu-24.04 or + # ubuntu-latest runners might not need this workaround. + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: 1 + steps: - name: Setup run: | diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 13c75a5dc..321bef0bb 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -360,6 +360,10 @@ jobs: rm -f src/*.generic make src/config.h.generic src/pcre2.h.generic + # Workaround for incorrect filesystem permissions on /usr/share/aclocal, which + # causes the m4 macros to be copied with incorrect permissions. + chmod u=rw,go=r m4/*.m4 + - name: Working directory clean run: | if [ -n "`git status --porcelain`" ] ; then