aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorFabian Meumertzheim <fabian@meumertzhe.im>2021-12-15 12:00:37 +0100
committerFabian Meumertzheim <fabian@meumertzhe.im>2021-12-15 12:40:59 +0100
commit726cc6bd0c0e26378574f74b712de948e56664ec (patch)
treec5880647e8b29782d15be0c99a60e56fed6f8a02 /.github
parent3707d34841174b4b5fa3acef5e9c4d7e5314a4bf (diff)
downloadjazzer-api-726cc6bd0c0e26378574f74b712de948e56664ec.tar.gz
Fix failure with --config=toolchain
Since our toolchain is loaded dynamically depending on the OS and architecture, we can't have a static --extra_toolchains in our .bazelrc. Instead, enable the toolchains in the specific GitHub Actions.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/release.yml4
-rw-r--r--.github/workflows/run-all-tests.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0769deca..b2d5566d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,10 +13,10 @@ jobs:
include:
- os: ubuntu-latest
arch: "linux"
- bazel_args: "--config=toolchain"
+ bazel_args: "--config=toolchain --extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-linux"
- os: macos-10.15
arch: "macos-x86_64"
- bazel_args: "--config=toolchain"
+ bazel_args: "--config=toolchain --extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-darwin"
- os: windows-2016
arch: "windows"
bazel_args: ""
diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml
index 5cb69f9d..2af6f5ec 100644
--- a/.github/workflows/run-all-tests.yml
+++ b/.github/workflows/run-all-tests.yml
@@ -29,7 +29,7 @@ jobs:
- os: macos-11
arch: "macos-x86_64"
# Always use the toolchain as UBSan produces linker errors with Apple LLVM 13.
- bazel_args: "--config=toolchain"
+ bazel_args: "--config=toolchain --extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-darwin"
cache: "/private/var/tmp/bazel-disk"
- os: windows-latest
arch: "windows"