Skip to content

Commit 481eb4e

Browse files
jagapioujagapiou
authored
Ensure that dmlab2d can still build wheels
- add required blaze flags to keep build working in bazel 8 - ensure reproducible builds by pinning version numbers - remove deprecated runners (macos-12, macos-13, ubunutu-20.04) - add new runners (macos-14, mac-os-15, macos-15-intel)
1 parent 0947443 commit 481eb4e

File tree

5 files changed

+106
-74
lines changed

5 files changed

+106
-74
lines changed

‎.bazelrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
build --cxxopt=-std=c++17
22
build --cxxopt=-Wno-sign-compare --cxxopt=-Wno-attributes
33
build --enable_platform_specific_config
4+
build --enable_workspace --noenable_bzlmod
45
build --flag_alias=lua_version=//dmlab2d/lib/lua:lua_version
56
build --flag_alias=macos_target_arch=@luajit_archive//:target_arch
67
build --flag_alias=luajit_external_unwinder=@luajit_archive//:use_external_unwinder
8+
build --incompatible_disallow_empty_glob=false
79

810
build:libc++ --repo_env=CXXFLAGS=-stdlib=libc++
911
build:libc++ --repo_env=LDFLAGS=-stdlib=libc++

‎.bazelversion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8.2.1

‎.github/workflows/make_wheel.yml‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,31 @@ jobs:
3232
prerelease: false
3333

3434
build-wheel:
35-
name: Build-wheel ${{ matrix.cfg.name }} for Python ${{ matrix.py.version }}
35+
name: Build-wheel ${{ matrix.cfg.name }} for Python ${{ matrix.python-version }}
3636

3737
runs-on: ${{ matrix.cfg.os }}
3838

3939
needs: create-release
4040

4141
strategy:
42+
fail-fast: false
4243
matrix:
4344
cfg:
4445
- { name: 'ManyLinux 2.35 LLVM+libstdc++', os: 'ubuntu-22.04', cc: clang, cxx: clang++, config: --linkopt=-fuse-ld=lld }
45-
- { name: 'ManyLinux 2.31 LLVM+libstdc++', os: 'ubuntu-20.04', cc: clang, cxx: clang++, config: --linkopt=-fuse-ld=lld }
46-
- { name: 'MacOS 11 x86_64 LLVM+libc++', os: 'macos-11', cc: clang, cxx: clang++, config: --config=libc++ --config=macos }
47-
- { name: 'MacOS 12 x86_64 LLVM+libc++', os: 'macos-12', cc: clang, cxx: clang++, config: --config=libc++ --config=macos }
48-
- { name: 'MacOS 13 x86_64 LLVM+libc++', os: 'macos-13', cc: clang, cxx: clang++, config: --config=libc++ --config=macos }
49-
- { name: 'MacOS 12 ARM64 LLVM+libc++', os: 'macos-12', cc: clang, cxx: clang++,
50-
config: --config=libc++ --config=macos_arm64 --repo_env=PY_PLATFORM_OVERRIDE=macosx_12_0_arm64 }
51-
- { name: 'MacOS 13 ARM64 LLVM+libc++', os: 'macos-13', cc: clang, cxx: clang++,
52-
config: --config=libc++ --config=macos_arm64 --repo_env=PY_PLATFORM_OVERRIDE=macosx_13_0_arm64 }
46+
- { name: 'ManyLinux 2.39 LLVM+libstdc++', os: 'ubuntu-24.04', cc: clang, cxx: clang++, config: --linkopt=-fuse-ld=lld }
47+
- { name: 'MacOS 15 x86_64 LLVM+libc++', os: 'macos-15-intel', cc: clang, cxx: clang++, config: --config=libc++ --config=macos }
48+
- { name: 'MacOS 14 ARM64 LLVM+libc++', os: 'macos-14', cc: clang, cxx: clang++,
49+
config: --config=libc++ --config=macos_arm64 --repo_env=PY_PLATFORM_OVERRIDE=macosx_14_0_arm64 }
50+
- { name: 'MacOS 15 ARM64 LLVM+libc++', os: 'macos-15', cc: clang, cxx: clang++,
51+
config: --config=libc++ --config=macos_arm64 --repo_env=PY_PLATFORM_OVERRIDE=macosx_15_0_arm64 }
5352
python-version:
5453
- '3.8'
5554
- '3.9'
5655
- '3.10'
5756
- '3.11'
57+
- '3.12'
58+
- '3.13'
59+
- '3.14'
5860

5961
env:
6062
CC: ${{ matrix.cfg.cc }}
@@ -69,7 +71,12 @@ jobs:
6971
python-version: ${{ matrix.python-version }}
7072

7173
- name: Install Python Dependencies
72-
run: pip3 install --upgrade pip packaging check-wheel-contents
74+
run: |
75+
pip3 install --upgrade setuptools packaging
76+
which python3
77+
python3 --version
78+
pip3 list
79+
bazel --version
7380
7481
- name: Build for Python ${{ matrix.python-version }}
7582
run: bazel --bazelrc=.bazelrc build --compilation_mode=opt --dynamic_mode=off --config=luajit ${{ matrix.cfg.config }} //dmlab2d:dmlab2d_wheel
@@ -81,10 +88,12 @@ jobs:
8188
echo WHEEL_NAME="${WHEEL_NAME}" >> "${GITHUB_ENV}"
8289
8390
- name: Check wheel contents
84-
run: check-wheel-contents bazel-bin/dmlab2d/${{ env.WHEEL_NAME }}
91+
run: |
92+
pip3 install check-wheel-contents
93+
check-wheel-contents bazel-bin/dmlab2d/${{ env.WHEEL_NAME }}
8594
86-
- name: Test wheel
87-
if: (!contains(env.WHEEL_NAME, 'arm64'))
95+
- name: Test wheel ${{ env.WHEEL_NAME }}
96+
if: (matrix.python-version != '3.14' || contains(matrix.cfg.os, 'ubuntu'))
8897
run: |
8998
pip install bazel-bin/dmlab2d/${{ env.WHEEL_NAME }}
9099
python -I - <<'____HERE'

‎.github/workflows/precommit.yml‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,69 +16,74 @@ concurrency:
1616

1717
jobs:
1818
build-and-test:
19-
name: Build+test ${{ matrix.name }}
19+
name: Build+test ${{ matrix.cfg.name }}
2020

21-
runs-on: ${{ matrix.os }}
21+
runs-on: ${{ matrix.cfg.os }}
2222

2323
timeout-minutes: 30
2424

2525
strategy:
2626
fail-fast: ${{ github.event_name != 'workflow_dispatch' }}
2727
matrix:
28-
include:
29-
- { name: 'Linux GCC', os: 'ubuntu-22.04', cc: gcc-12, cxx: g++-12, config: }
30-
- { name: 'Linux LLVM+libstdc++', os: 'ubuntu-22.04', cc: clang, cxx: clang++, config: --linkopt=-fuse-ld=lld }
31-
- { name: 'Linux LLVM+libc++', os: 'ubuntu-22.04', cc: clang, cxx: clang++, config: --config=libc++ --linkopt=-fuse-ld=lld }
32-
- { name: 'MacOS 12 x86_64 LLVM+libc++', os: 'macos-12', cc: clang, cxx: clang++, config: --config=libc++ --config=macos }
33-
- { name: 'MacOS 13 x86_64 LLVM+libc++', os: 'macos-13', cc: clang, cxx: clang++, config: --config=libc++ --config=macos }
34-
- { name: 'MacOS 12 ARM64 LLVM+libc++', os: 'macos-12', cc: clang, cxx: clang++, config: --config=libc++ --config=macos_arm64 }
35-
- { name: 'MacOS 13 ARM64 LLVM+libc++', os: 'macos-13', cc: clang, cxx: clang++, config: --config=libc++ --config=macos_arm64 }
28+
cfg:
29+
- { name: 'Linux GCC', os: 'ubuntu-24.04', cc: gcc-12, cxx: g++-12, config: }
30+
- { name: 'Linux LLVM+libstdc++', os: 'ubuntu-24.04', cc: clang, cxx: clang++, config: --linkopt=-fuse-ld=lld }
31+
- { name: 'Linux LLVM+libc++', os: 'ubuntu-24.04', cc: clang, cxx: clang++, config: --config=libc++ --linkopt=-fuse-ld=lld }
32+
- { name: 'MacOS x86_64 LLVM+libc++', os: 'macos-15-intel', cc: clang, cxx: clang++, config: --config=libc++ --config=macos }
33+
- { name: 'MacOS ARM64 LLVM+libc++', os: 'macos-15', cc: clang, cxx: clang++, config: --config=libc++ --config=macos_arm64 }
34+
python-version:
35+
- '3.10'
3636

3737
env:
38-
CC: ${{ matrix.cc }}
39-
CXX: ${{ matrix.cxx }}
38+
CC: ${{ matrix.cfg.cc }}
39+
CXX: ${{ matrix.cfg.cxx }}
4040

4141
steps:
4242
- uses: actions/checkout@v3
4343

4444
- name: install infrastructure (Linux)
45-
if: matrix.os == 'ubuntu-22.04'
45+
if: startsWith( matrix.cfg.os, 'ubuntu-' )
4646
run: |
47-
sudo apt-get install python3-dev python3-numpy python3-packaging
4847
sudo ln -s /usr/lib/llvm-10/include/c++/v1 /usr/include/c++/v1
4948
50-
- name: install infrastructure (MacOS)
51-
if: matrix.os == 'macos-12' || matrix.os == 'macos-13'
52-
run: sudo -H pip3 install numpy packaging
49+
- name: Set up Python ${{ matrix.python-version }}
50+
id: setup-python
51+
uses: actions/setup-python@v3
52+
with:
53+
python-version: ${{ matrix.python-version }}
54+
55+
- name: Install Python dependencies
56+
run: |
57+
pip3 install numpy packaging
58+
which python3
59+
python3 --version
60+
pip3 list
61+
bazel --version
5362
5463
- name: build-lua5.1
5564
run: |
5665
bazel --bazelrc=.bazelrc build --config=lua5_1 ${{ matrix.config }} //...
5766
- name: test-lua5.1
58-
if: (!contains(matrix.config, 'arm64'))
5967
run: |
6068
bazel --bazelrc=.bazelrc test --config=lua5_1 ${{ matrix.config }} --test_output=errors //...
6169
6270
- name: build-lua5.2
6371
run: |
6472
bazel --bazelrc=.bazelrc build --config=lua5_2 ${{ matrix.config }} //...
6573
- name: test-lua5.2
66-
if: (!contains(matrix.config, 'arm64'))
6774
run: |
6875
bazel --bazelrc=.bazelrc test --config=lua5_2 ${{ matrix.config }} --test_output=errors //...
6976
7077
- name: build-luajit
7178
run: |
7279
bazel --bazelrc=.bazelrc build --config=luajit ${{ matrix.config }} //...
7380
- name: test-luajit
74-
if: (!contains(matrix.config, 'arm64'))
7581
run: |
7682
bazel --bazelrc=.bazelrc test --config=luajit ${{ matrix.config }} --test_output=errors //...
7783
7884
- name: build-luajit-internal_unwind
7985
run: |
8086
bazel --bazelrc=.bazelrc build --config=luajit ${{ matrix.config }} --copt=-fno-asynchronous-unwind-tables --luajit_external_unwinder=False //...
8187
- name: test-luajit-internal_unwind
82-
if: (!contains(matrix.config, 'arm64'))
8388
run: |
8489
bazel --bazelrc=.bazelrc test --config=luajit ${{ matrix.config }} --copt=-fno-asynchronous-unwind-tables --luajit_external_unwinder=False --test_output=errors //...

‎WORKSPACE‎

Lines changed: 55 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,86 @@
11
workspace(name = "org_deepmind_lab2d")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4-
load("@//:python_system.bzl", "python_repo")
54

65
http_archive(
76
name = "com_google_googletest",
8-
strip_prefix = "googletest-main",
9-
urls = ["https://github.com/google/googletest/archive/main.zip"],
7+
sha256 = "f179ec217f9b3b3f3c6e8b02d3e7eda997b49e4ce26d6b235c9053bec9c0bf9f",
8+
strip_prefix = "googletest-1.15.2",
9+
urls = ["https://github.com/google/googletest/archive/refs/tags/v1.15.2.zip"],
1010
)
1111

1212
http_archive(
1313
name = "com_google_benchmark",
14-
strip_prefix = "benchmark-main",
15-
urls = ["https://github.com/google/benchmark/archive/main.zip"],
14+
sha256 = "8a63c9c6adf9e7ce8d0d81f251c47de83efb5e077e147d109fa2045daac8368b",
15+
strip_prefix = "benchmark-1.9.1",
16+
urls = ["https://github.com/google/benchmark/archive/refs/tags/v1.9.1.zip"],
1617
)
1718

1819
http_archive(
1920
name = "rules_cc",
20-
strip_prefix = "rules_cc-main",
21-
urls = ["https://github.com/bazelbuild/rules_cc/archive/main.zip"],
21+
sha256 = "e7c1639aa227d2cd335825d37caa2a234b40373be3ef8f87c25724ed01cab5e8",
22+
strip_prefix = "rules_cc-0.0.17",
23+
urls = ["https://github.com/bazelbuild/rules_cc/archive/refs/tags/0.0.17.zip"],
2224
)
2325

2426
http_archive(
2527
name = "rules_python",
26-
strip_prefix = "rules_python-main",
27-
url = "https://github.com/bazelbuild/rules_python/archive/main.zip",
28+
sha256 = "7149fff45f7925bb6d45543ed99bfd3544ec63df82ef70cf0ce38b669c9d3bd6",
29+
strip_prefix = "rules_python-1.0.0",
30+
urls = ["https://github.com/bazelbuild/rules_python/archive/refs/tags/1.0.0.zip"],
2831
)
2932

3033
http_archive(
3134
name = "bazel_skylib",
32-
strip_prefix = "bazel-skylib-main",
33-
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/main.zip"],
35+
sha256 = "23ef380aa62e2f1b631d02d0c9d163e43be03e880953dafe133d754fb8d96f0a",
36+
strip_prefix = "bazel-skylib-1.7.1",
37+
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/refs/tags/1.7.1.zip"],
3438
)
3539

3640
http_archive(
3741
name = "com_google_absl",
38-
strip_prefix = "abseil-cpp-master",
39-
urls = ["https://github.com/abseil/abseil-cpp/archive/master.zip"],
42+
sha256 = "95e90be7c3643e658670e0dd3c1b27092349c34b632c6e795686355f67eca89f",
43+
strip_prefix = "abseil-cpp-20240722.0",
44+
urls = ["https://github.com/abseil/abseil-cpp/archive/refs/tags/20240722.0.zip"],
4045
)
4146

4247
http_archive(
4348
name = "com_google_absl_py",
44-
strip_prefix = "abseil-py-main",
45-
urls = ["https://github.com/abseil/abseil-py/archive/main.zip"],
49+
sha256 = "e11083ee5a69afe5c82321ec2505061407ec315789b9b886cbfaf46560431c0b",
50+
strip_prefix = "abseil-py-2.1.0",
51+
urls = ["https://github.com/abseil/abseil-py/archive/refs/tags/v2.1.0.zip"],
4652
)
4753

4854
http_archive(
4955
name = "eigen_archive",
5056
build_file = "@//bazel:eigen.BUILD",
51-
sha256 = "515b3c266d798f3a112efe781dda0cf1aef7bd73f6864d8f4f16129310ae1fdf",
52-
strip_prefix = "eigen-b02c384ef4e8eba7b8bdef16f9dc6f8f4d6a6b2b",
57+
sha256 = "8586084f71f9bde545ee7fa6d00288b264a2b7ac3607b974e54d13e7162c1c72",
58+
strip_prefix = "eigen-3.4.0",
5359
urls = [
54-
"https://gitlab.com/libeigen/eigen/-/archive/b02c384ef4e8eba7b8bdef16f9dc6f8f4d6a6b2b/eigen-b02c384ef4e8eba7b8bdef16f9dc6f8f4d6a6b2b.tar.gz",
55-
"https://storage.googleapis.com/mirror.tensorflow.org/gitlab.com/libeigen/eigen/-/archive/b02c384ef4e8eba7b8bdef16f9dc6f8f4d6a6b2b/eigen-b02c384ef4e8eba7b8bdef16f9dc6f8f4d6a6b2b.tar.gz",
60+
"https://mirror.bazel.build/gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz",
61+
"https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz",
5662
],
5763
)
5864

5965
http_archive(
6066
name = "png_archive",
6167
build_file = "@//bazel:png.BUILD",
62-
sha256 = "c2c50c13a727af73ecd3fc0167d78592cf5e0bca9611058ca414b6493339c784",
63-
strip_prefix = "libpng-1.6.37",
68+
sha256 = "0b35b4bbdf454d589bf8195bc281fefecc4b2529b42ddfbe8b6c108b986841f9",
69+
strip_prefix = "libpng-1.6.44",
6470
urls = [
65-
"https://mirror.bazel.build/github.com/glennrp/libpng/archive/v1.6.37.zip",
66-
"https://github.com/glennrp/libpng/archive/v1.6.37.zip",
71+
"https://mirror.bazel.build/github.com/pnggroup/libpng/archive/v1.6.44.zip",
72+
"https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.44.zip",
6773
],
6874
)
6975

7076
http_archive(
7177
name = "zlib_archive",
7278
build_file = "@//bazel:zlib.BUILD",
73-
sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
74-
strip_prefix = "zlib-1.2.11",
79+
sha256 = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23",
80+
strip_prefix = "zlib-1.3.1",
7581
urls = [
76-
"https://mirror.bazel.build/zlib.net/zlib-1.2.11.tar.gz",
77-
"https://zlib.net/zlib-1.2.11.tar.gz",
82+
"https://mirror.bazel.build/zlib.net/zlib-1.3.1.tar.gz",
83+
"https://zlib.net/zlib-1.3.1.tar.gz",
7884
],
7985
)
8086

@@ -92,57 +98,66 @@ http_archive(
9298
http_archive(
9399
name = "lua5_2_archive",
94100
build_file = "@//bazel:lua5_2.BUILD",
101+
sha256 = "b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b",
95102
strip_prefix = "lua-5.2.4/src",
96103
urls = [
97104
"https://mirror.bazel.build/www.lua.org/ftp/lua-5.2.4.tar.gz",
98105
"https://www.lua.org/ftp/lua-5.2.4.tar.gz",
99106
],
100107
)
101108

102-
LJ_VER="f0ff869bc2fffa17bb765c4c773457578da125a9"
103-
104109
http_archive(
105110
name = "luajit_archive",
106111
build_file = "@//bazel:luajit.BUILD",
107-
strip_prefix = "LuaJIT-{}".format(LJ_VER),
108-
urls = ["https://github.com/LuaJIT/LuaJIT/archive/{}.tar.gz".format(LJ_VER)],
112+
sha256 = "4af5d94608a7ab72c9a7f72833a9222a7e0a298255e058902c4a59012c53bbfc",
113+
strip_prefix = "LuaJIT-f0ff869bc2fffa17bb765c4c773457578da125a9",
114+
urls = ["https://github.com/LuaJIT/LuaJIT/archive/f0ff869bc2fffa17bb765c4c773457578da125a9.tar.gz"],
109115
)
110116

111117
http_archive(
112118
name = "dm_env_archive",
113119
build_file = "@//bazel:dm_env.BUILD",
114-
strip_prefix = "dm_env-3c6844db2aa4ed5994b2c45dbfd9f31ad948fbb8",
115-
urls = ["https://github.com/deepmind/dm_env/archive/3c6844db2aa4ed5994b2c45dbfd9f31ad948fbb8.zip"],
120+
sha256 = "ed832e301bfddb6e98812567ee0217f6016c862357a0af2a94088ac6e6224af6",
121+
strip_prefix = "dm_env-ea2a17bed7a60c82f637891c53f3a37f70d91486",
122+
urls = ["https://github.com/deepmind/dm_env/archive/ea2a17bed7a60c82f637891c53f3a37f70d91486.zip"],
116123
)
117124

118125
http_archive(
119126
name = "tree_archive",
120127
build_file = "@//bazel:tree.BUILD",
121-
strip_prefix = "tree-master",
122-
urls = ["https://github.com/deepmind/tree/archive/master.zip"],
128+
sha256 = "407606263ee3f049da5c49071522cf5d37142c2de04ba52c9d599da948f4ee08",
129+
strip_prefix = "tree-0.1.8",
130+
urls = ["https://github.com/google-deepmind/tree/archive/refs/tags/0.1.8.zip"],
123131
)
124132

125133
http_archive(
126134
name = "pybind11_archive",
127135
build_file = "@//bazel:pybind11.BUILD",
128-
strip_prefix = "pybind11-master",
129-
urls = ["https://github.com/pybind/pybind11/archive/master.zip"],
136+
sha256 = "d0a116e91f64a4a2d8fb7590c34242df92258a61ec644b79127951e821b47be6",
137+
strip_prefix = "pybind11-2.13.6",
138+
urls = ["https://github.com/pybind/pybind11/archive/refs/tags/v2.13.6.zip"],
130139
)
131140

132141
http_archive(
133142
name = "build_bazel_apple_support",
134-
sha256 = "9f7bb62c3ae889e0eae8c18458fd8764e2e537687d9a1d85885d6af980e4fc31",
135-
url = "https://github.com/bazelbuild/apple_support/releases/download/1.6.0/apple_support.1.6.0.tar.gz",
143+
sha256 = "b53f6491e742549f13866628ddffcc75d1f3b2d6987dc4f14a16b242113c890b",
144+
urls = ["https://github.com/bazelbuild/apple_support/releases/download/1.17.1/apple_support.1.17.1.tar.gz"],
136145
)
137146

138147
load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
139148

140149
apple_support_dependencies()
141150

142-
load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
151+
load("@bazel_features//:deps.bzl", "bazel_features_deps")
152+
153+
bazel_features_deps()
154+
155+
load("@rules_python//python:repositories.bzl", "py_repositories")
143156

144157
py_repositories()
145158

159+
load("@//:python_system.bzl", "python_repo")
160+
146161
python_repo(
147162
name = "python_system",
148163
)

0 commit comments

Comments
 (0)