Backport of two CI build fixes

PCRE2Project · Feb 4, 2025 · 2dce776 · 2dce776
1 parent 8d2f01a
commit 2dce776
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git 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
@@ -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