Skip to content

Commit 2dce776

Browse files
committed
Backport of two CI build fixes
1 parent 8d2f01a commit 2dce776

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

.github/workflows/clang-analyzer.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ jobs:
1818
security-events: write
1919
contents: read
2020

21+
env:
22+
# The @microsoft/sarif-multitool tool actually uses DotnetCore, which in
23+
# turn aborts when it finds that GitHub's CI machine doesn't have ICU.
24+
# Just turn off localisation. A future version of the ubuntu-24.04 or
25+
# ubuntu-latest runners might not need this workaround.
26+
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: 1
27+
2128
steps:
2229
- name: Setup
2330
run: |

.github/workflows/dev.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,10 @@ jobs:
360360
rm -f src/*.generic
361361
make src/config.h.generic src/pcre2.h.generic
362362
363+
# Workaround for incorrect filesystem permissions on /usr/share/aclocal, which
364+
# causes the m4 macros to be copied with incorrect permissions.
365+
chmod u=rw,go=r m4/*.m4
366+
363367
- name: Working directory clean
364368
run: |
365369
if [ -n "`git status --porcelain`" ] ; then

0 commit comments

Comments
 (0)