Skip to content

Commit 1a1d509

Browse files
Updated Bazel versions (#19133)
Updated latest Bazel versions
1 parent fe02254 commit 1a1d509

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

.ci/docker/conan-tests

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ ENV PY37=3.7.9 \
2525
CLANG_14=/usr/bin/clang-14 \
2626
CLANGXX_14=/usr/bin/clang++-14 \
2727
BAZEL_6=6.5.0 \
28-
BAZEL_7=7.4.1 \
29-
BAZEL_8=8.0.0 \
28+
BAZEL_7=7.6.2 \
29+
BAZEL_8=8.4.2 \
3030
EMSDK=4.0.10
3131

3232
RUN apt-get update && \

.github/workflows/osx-tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
~/Applications/CMake/3.27.9
6161
~/Applications/CMake/4.0.0-rc3
6262
~/Applications/bazel/6.5.0
63-
~/Applications/bazel/7.4.1
64-
~/Applications/bazel/8.0.0
63+
~/Applications/bazel/7.6.2
64+
~/Applications/bazel/8.4.2
6565
key: ${{ runner.os }}-conan-tools-cache
6666

6767
- name: Build CMake old versions not available for ARM
@@ -107,7 +107,7 @@ jobs:
107107
if: steps.cache-tools.outputs.cache-hit != 'true'
108108
run: |
109109
set -e
110-
for version in 6.5.0 7.4.1 8.0.0; do
110+
for version in 6.5.0 7.6.2 8.4.2; do
111111
mkdir -p ${HOME}/Applications/bazel/${version}
112112
wget -q -O ${HOME}/Applications/bazel/${version}/bazel https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64
113113
chmod +x ${HOME}/Applications/bazel/${version}/bazel
@@ -149,8 +149,8 @@ jobs:
149149
~/Applications/CMake/3.27.9
150150
~/Applications/CMake/4.0.0-rc3
151151
~/Applications/bazel/6.5.0
152-
~/Applications/bazel/7.4.1
153-
~/Applications/bazel/8.0.0
152+
~/Applications/bazel/7.6.2
153+
~/Applications/bazel/8.4.2
154154
key: ${{ runner.os }}-conan-tools-cache
155155

156156
- name: Select Xcode 16.4

.github/workflows/win-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ jobs:
164164
C:\tools\cmake\3.27.9
165165
C:\tools\cmake\4.0.0-rc3
166166
C:\tools\bazel\6.5.0
167-
C:\tools\bazel\7.4.1
168-
C:\tools\bazel\8.0.0
167+
C:\tools\bazel\7.6.2
168+
C:\tools\bazel\8.4.2
169169
key: ${{ runner.os }}-conan-tools-cache
170170

171171
- name: Install CMake versions
@@ -194,7 +194,7 @@ jobs:
194194
- name: Install Bazel versions
195195
if: steps.cache-tools.outputs.cache-hit != 'true'
196196
run: |
197-
$BAZEL_BUILD_VERSIONS = "6.5.0", "7.4.1", "8.0.0"
197+
$BAZEL_BUILD_VERSIONS = "6.5.0", "7.6.2", "8.4.2"
198198
foreach ($version in $BAZEL_BUILD_VERSIONS) {
199199
Write-Host "Downloading Bazel version $version for Windows..."
200200
$destination = "C:\tools\bazel\$version"

test/conftest.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,16 +153,16 @@
153153
"system": {"path": {'Windows': "C:/tools/cygwin/bin"}},
154154
},
155155
'bazel': {
156-
"default": "7",
157-
"6.5.0": {"path": {'Linux': '/usr/share/bazel-6.5.0/bin',
156+
"default": "7.x",
157+
"6.x": {"path": {'Linux': '/usr/share/bazel-6.5.0/bin',
158158
'Windows': 'C:/tools/bazel/6.5.0',
159159
'Darwin': '/Users/runner/Applications/bazel/6.5.0'}},
160-
"7.4.1": {"path": {'Linux': '/usr/share/bazel-7.4.1/bin',
161-
'Windows': 'C:/tools/bazel/7.4.1',
162-
'Darwin': '/Users/runner/Applications/bazel/7.4.1'}},
163-
"8.0.0": {"path": {'Linux': '/usr/share/bazel-8.0.0/bin',
164-
'Windows': 'C:/tools/bazel/8.0.0',
165-
'Darwin': '/Users/runner/Applications/bazel/8.0.0'}},
160+
"7.x": {"path": {'Linux': '/usr/share/bazel-7.6.2/bin',
161+
'Windows': 'C:/tools/bazel/7.6.2',
162+
'Darwin': '/Users/runner/Applications/bazel/7.6.2'}},
163+
"8.x": {"path": {'Linux': '/usr/share/bazel-8.4.2/bin',
164+
'Windows': 'C:/tools/bazel/8.4.2',
165+
'Darwin': '/Users/runner/Applications/bazel/8.4.2'}},
166166
},
167167
'premake': {
168168
"exe": "premake5",

test/functional/toolchains/google/test_bazel.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def base_profile():
3939

4040

4141
@pytest.mark.parametrize("build_type", ["Debug", "Release", "RelWithDebInfo", "MinSizeRel"])
42-
@pytest.mark.tool("bazel", "6.5.0")
42+
@pytest.mark.tool("bazel", "6.x")
4343
def test_basic_exe_6x(bazelrc, build_type, base_profile, bazel_output_root_dir):
4444
client = TestClient(path_with_spaces=False)
4545
client.run(f"new bazel_exe -d name=myapp -d version=1.0 -d output_root_dir={bazel_output_root_dir}")
@@ -57,7 +57,7 @@ def test_basic_exe_6x(bazelrc, build_type, base_profile, bazel_output_root_dir):
5757

5858

5959
@pytest.mark.parametrize("build_type", ["Debug", "Release", "RelWithDebInfo", "MinSizeRel"])
60-
@pytest.mark.tool("bazel", "7.4.1")
60+
@pytest.mark.tool("bazel", "7.x")
6161
def test_basic_exe(bazelrc, build_type, base_profile, bazel_output_root_dir):
6262
client = TestClient(path_with_spaces=False)
6363
client.run(f"new bazel_7_exe -d name=myapp -d version=1.0 -d output_root_dir={bazel_output_root_dir}")
@@ -74,7 +74,7 @@ def test_basic_exe(bazelrc, build_type, base_profile, bazel_output_root_dir):
7474
assert "myapp/1.0: Hello World Debug!" in client.out
7575

7676

77-
@pytest.mark.tool("bazel", "8.0.0")
77+
@pytest.mark.tool("bazel", "8.x")
7878
def test_basic_lib(bazelrc, base_profile, bazel_output_root_dir):
7979
"""
8080
Issue related: https://github.com/conan-io/conan/issues/17438
@@ -86,7 +86,7 @@ def test_basic_lib(bazelrc, base_profile, bazel_output_root_dir):
8686

8787

8888
@pytest.mark.parametrize("shared", [False, True])
89-
@pytest.mark.tool("bazel", "6.5.0")
89+
@pytest.mark.tool("bazel", "6.x")
9090
def test_transitive_libs_consuming_6x(shared, bazel_output_root_dir):
9191
"""
9292
Testing the next dependencies structure for shared/static libs
@@ -212,7 +212,7 @@ def test_transitive_libs_consuming_6x(shared, bazel_output_root_dir):
212212

213213

214214
@pytest.mark.parametrize("shared", [False, True])
215-
@pytest.mark.tool("bazel", "7.4.1")
215+
@pytest.mark.tool("bazel", "7.x")
216216
@pytest.mark.skipif(platform.system() == "Linux",
217217
reason="Conan CI fails (likely related to parallel "
218218
"tests running??). Skipping it for now!")
@@ -344,7 +344,7 @@ def test_transitive_libs_consuming_7x(shared, bazel_output_root_dir):
344344
assert "myfirstlib/1.2.11: Hello World Release!"
345345

346346

347-
@pytest.mark.tool("bazel", "8.0.0")
347+
@pytest.mark.tool("bazel", "8.x")
348348
def test_empty_bazel_query():
349349
"""
350350
Test that following a simple steps using the BazelDeps and running

test/functional/toolchains/google/test_bazeltoolchain_cross_compilation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
@pytest.mark.skipif(platform.system() != "Darwin", reason="Only for Darwin")
13-
@pytest.mark.tool("bazel", "6.5.0") # not working for Bazel 7.x
13+
@pytest.mark.tool("bazel", "6.x") # not working for Bazel 7.x
1414
def test_bazel_simple_cross_compilation():
1515
profile = textwrap.dedent("""
1616
[settings]

0 commit comments

Comments
 (0)