From 80bf0fa4501cba777479c4744a37ebf5b9b1a42d Mon Sep 17 00:00:00 2001 From: Wu Wayne Date: Thu, 14 Dec 2023 12:25:12 +0900 Subject: [PATCH 1/2] Change file just to test ci --- mozjs-sys/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozjs-sys/build.rs b/mozjs-sys/build.rs index c3a7196431e..f3ff866aea3 100644 --- a/mozjs-sys/build.rs +++ b/mozjs-sys/build.rs @@ -18,7 +18,7 @@ const ENV_VARS: &'static [&'static str] = &[ "CFLAGS", "CLANGFLAGS", "CPP", - "CPPFLAGS", + "CPPFLAGS", "CXX", "CXXFLAGS", "MAKE", From 11c469560b9579b3314f32ce8529bfd65cf4f211 Mon Sep 17 00:00:00 2001 From: Wu Wayne Date: Thu, 14 Dec 2023 13:09:12 +0900 Subject: [PATCH 2/2] Fix macOS CI --- .github/workflows/rust.yml | 6 +++++- mozjs-sys/build.rs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1cdb49e6f40..8ee0a1c5f3c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -30,7 +30,11 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install deps - run: brew install llvm yasm + run: | + # Unlink and re-link to prevent errors when github mac runner images + # https://github.com/actions/setup-python/issues/577 + brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done + brew install llvm yasm - name: Run sccache-cache uses: mozilla-actions/sccache-action@v0.0.3 - name: Build diff --git a/mozjs-sys/build.rs b/mozjs-sys/build.rs index f3ff866aea3..c3a7196431e 100644 --- a/mozjs-sys/build.rs +++ b/mozjs-sys/build.rs @@ -18,7 +18,7 @@ const ENV_VARS: &'static [&'static str] = &[ "CFLAGS", "CLANGFLAGS", "CPP", - "CPPFLAGS", + "CPPFLAGS", "CXX", "CXXFLAGS", "MAKE",