diff options
| author | Matt Mastracci <matthew@mastracci.com> | 2024-04-03 18:02:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-04 00:02:57 +0000 |
| commit | 3e40c510c05f3fe7fa6ad201d8770745f8707dc8 (patch) | |
| tree | d45dfdd35ef3117f0c98151735f3c8531456847e | |
| parent | d3d3582b1f1b71b18d8d89cdf8e14f112b8f40a7 (diff) | |
chore: try to fix mac runner (#23214)
https://github.com/actions/runner-images/issues/9626
| -rwxr-xr-x | .github/workflows/ci.generate.ts | 11 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 466d30ba4..1aae3dea7 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -548,6 +548,17 @@ const ci = { ...sysRootStep, }, { + name: "Remove macOS cURL --ipv4 flag", + run: [ + // cURL's --ipv4 flag is busted for now + "curl --version", + "which curl", + "cat /etc/hosts", + "rm ~/.curlrc || true", + ].join("\n"), + if: `matrix.os == 'macos'`, + }, + { name: "Install macOS aarch64 lld", run: [ "./tools/install_prebuilt.js ld64.lld", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0dfc1654d..43a4b37f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -324,6 +324,13 @@ jobs: CC=clang-16 CFLAGS=-flto=thin --sysroot=/sysroot __0 + - name: Remove macOS cURL --ipv4 flag + run: |- + curl --version + which curl + cat /etc/hosts + rm ~/.curlrc || true + if: '!(matrix.skip) && (matrix.os == ''macos'')' - name: Install macOS aarch64 lld run: ./tools/install_prebuilt.js ld64.lld if: '!(matrix.skip) && (matrix.os == ''macos'' && matrix.arch == ''aarch64'')' |