mirror of
https://github.com/edgelesssys/constellation.git
synced 2024-10-01 01:36:09 -04:00
deps: rename bazel-zig-cc to hermetic_cc_toolchain (#1695)
This commit is contained in:
parent
bf051174f6
commit
0c206e62d0
1
.github/actions/setup_bazel/action.yml
vendored
1
.github/actions/setup_bazel/action.yml
vendored
@ -36,7 +36,6 @@ runs:
|
||||
/home/runner/.cache/bazel
|
||||
/home/runner/.cache/shared_bazel_repository_cache
|
||||
/home/runner/.cache/shared_bazel_action_cache
|
||||
/tmp/bazel-zig-cc
|
||||
key: bazel
|
||||
|
||||
- name: Configure Bazel
|
||||
|
1
.github/workflows/warm-bazel-cache.yml
vendored
1
.github/workflows/warm-bazel-cache.yml
vendored
@ -51,5 +51,4 @@ jobs:
|
||||
/home/runner/.cache/bazel
|
||||
/home/runner/.cache/shared_bazel_repository_cache
|
||||
/home/runner/.cache/shared_bazel_action_cache
|
||||
/tmp/bazel-zig-cc
|
||||
key: ${{ env.CACHE_KEY }}
|
||||
|
@ -50,14 +50,14 @@ buildifier_deps()
|
||||
|
||||
# C / C++ toolchains
|
||||
|
||||
load("//bazel/toolchains:zig_cc_deps.bzl", "zig_cc_deps")
|
||||
load("//bazel/toolchains:hermetic_cc_deps.bzl", "hermetic_cc_deps")
|
||||
|
||||
zig_cc_deps()
|
||||
hermetic_cc_deps()
|
||||
|
||||
load("@bazel-zig-cc//toolchain:defs.bzl", zig_toolchains = "toolchains")
|
||||
load("@hermetic_cc_toolchain//toolchain:defs.bzl", zig_toolchains = "toolchains")
|
||||
|
||||
# If needed, we can specify a specific version of the Zig toolchain to use.
|
||||
# If not specified, bazel-zig-cc will use a known good version of Zig.
|
||||
# If not specified, hermetic_cc_toolchain will use a known good version of Zig.
|
||||
# See https://ziglang.org/download/ for the latest releases
|
||||
|
||||
# zig_toolchains(
|
||||
|
@ -1,9 +1,9 @@
|
||||
"""bazel-zig-cc build rules"""
|
||||
"""hermetic cc toolchain (bazel-zig-cc) build rules"""
|
||||
|
||||
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
||||
|
||||
def zig_cc_deps():
|
||||
"""Loads the dependencies for bazel-zig-cc."""
|
||||
def hermetic_cc_deps():
|
||||
"""Loads the dependencies for hermetic_cc_toolchain."""
|
||||
|
||||
http_archive(
|
||||
name = "bazel_skylib",
|
||||
@ -16,16 +16,12 @@ def zig_cc_deps():
|
||||
type = "tar.gz",
|
||||
)
|
||||
|
||||
# TODO(malt3): Update to a release version once the next release is out.
|
||||
# Upgraded to work around https://github.com/uber/bazel-zig-cc/issues/22
|
||||
# See also https://github.com/uber/bazel-zig-cc/pull/23
|
||||
http_archive(
|
||||
name = "bazel-zig-cc",
|
||||
sha256 = "bea372f7f9bd8541f7b0a152c76c7b9396201c36a0ed229b36c48301815c3141",
|
||||
strip_prefix = "bazel-zig-cc-f3e4542bd62f4aef794a3d184140a9d30b8fadb8",
|
||||
name = "hermetic_cc_toolchain",
|
||||
sha256 = "43a1b398f08109c4f03b9ba2b3914bd43d1fec0425f71b71f802bf3f78cee0c2",
|
||||
urls = [
|
||||
"https://cdn.confidential.cloud/constellation/cas/sha256/bea372f7f9bd8541f7b0a152c76c7b9396201c36a0ed229b36c48301815c3141",
|
||||
"https://github.com/uber/bazel-zig-cc/archive/f3e4542bd62f4aef794a3d184140a9d30b8fadb8.tar.gz",
|
||||
"https://cdn.confidential.cloud/constellation/cas/sha256/43a1b398f08109c4f03b9ba2b3914bd43d1fec0425f71b71f802bf3f78cee0c2",
|
||||
"https://github.com/uber/hermetic_cc_toolchain/releases/download/v2.0.0-rc1/hermetic_cc_toolchain-v2.0.0-rc1.tar.gz",
|
||||
],
|
||||
type = "tar.gz",
|
||||
)
|
Loading…
Reference in New Issue
Block a user