Skip to content

Commit bde91e5

Browse files
committed
fix bazel
Change-Id: I10bdd484933da40c7af016f239f446d5c0a3a591
1 parent 5c9f841 commit bde91e5

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.bazelrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@ build --action_env=CC
2424
build --action_env=CXX
2525
build --action_env=LD_LIBRARY_PATH
2626
build --action_env=LLVM_CONFIG
27-
build --action_env=PATH
27+
build --action_env=PATH
28+
29+
build --cxxopt='-std=c++17'
30+
build:host --cxxopt='-std=c++17'

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
steps:
2525
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2626
- uses: actions/checkout@v2
27-
27+
2828
- name: Setup Bazel
2929
run: |
3030
sudo apt-get -qq install npm
3131
sudo npm install -g @bazel/bazelisk
32-
- name: Use Bazel
32+
- name: Bazel Help
3333
if: matrix.os != 'windows'
3434
run: bazel -h
35-
- name: Compile All Targets
36-
run: bazel build //...
35+
- name: Build with Bazel
36+
run: bazel build //... -s

deps.bzl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ def github_archive(name, org, repo, ref, sha256):
3838
name = name,
3939
strip_prefix = repo + "-" + stripRef,
4040
urls = [
41-
"https://mirror.bazel.build/github.com/%s/%s/archive/%s.tar.gz" % (org, repo, ref),
42-
"https://github.com/%s/%s/archive/%s.tar.gz" % (org, repo, ref),
41+
# "https://mirror.bazel.build/github.com/%s/%s/archive/%s.tar.gz" % (org, repo, ref),
42+
# "https://github.com/%s/%s/archive/%s.tar.gz" % (org, repo, ref),
43+
"https://github.com/%s/%s/archive/refs/tags/%s.tar.gz" % (org, repo, ref)
4344
],
4445
sha256 = sha256,
4546
)
@@ -48,6 +49,6 @@ def io_grpc_grpc_java(**kwargs):
4849
"""grpc java plugin and jars
4950
"""
5051
name = "io_grpc_grpc_java"
51-
ref = get_ref(name, "8eff2630828a7ec6f4980b5b46f30f875070a4e4", kwargs) # v1.19.0 and changes up to PR #5456
52-
sha256 = get_sha256(name, "f0e17fb16a404ba473429144481221e2c970c65596f65129002af3c73dcfe141", kwargs)
52+
ref = get_ref(name, "v1.45.0", kwargs) # v1.19.0 and changes up to PR #5456
53+
sha256 = get_sha256(name, "83a3e094be70978cd843778a3214268714e077343fd9a5baacad31dd420304c3", kwargs)
5354
github_archive(name, "grpc", "grpc-java", ref, sha256)

0 commit comments

Comments
 (0)