Skip to content

Commit aaa961e

Browse files
committed
WIP
1 parent 0947443 commit aaa961e

File tree

12 files changed

+44
-20
lines changed

12 files changed

+44
-20
lines changed

.github/workflows/make_wheel.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ 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

@@ -41,20 +41,21 @@ jobs:
4141
strategy:
4242
matrix:
4343
cfg:
44+
# - { name: 'ManyLinux 2.31 LLVM+libstdc++', os: 'ubuntu-20.04', cc: clang, cxx: clang++, config: --linkopt=-fuse-ld=lld }
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 ???? LLVM+libstdc++', os: 'ubuntu-24.04', cc: clang, cxx: clang++, config: --linkopt=-fuse-ld=lld }
47+
# - { name: 'MacOS 13 x86_64 LLVM+libc++', os: 'macos-13', cc: clang, cxx: clang++, config: --config=libc++ --config=macos }
48+
# - { name: 'MacOS 14 x86_64 LLVM+libc++', os: 'macos-14', cc: clang, cxx: clang++, config: --config=libc++ --config=macos }
49+
# - { name: 'MacOS 13 ARM64 LLVM+libc++', os: 'macos-13', cc: clang, cxx: clang++,
50+
# config: --config=libc++ --config=macos_arm64 --repo_env=PY_PLATFORM_OVERRIDE=macosx_13_0_arm64 }
51+
# - { name: 'MacOS 14 ARM64 LLVM+libc++', os: 'macos-14', cc: clang, cxx: clang++,
52+
# config: --config=libc++ --config=macos_arm64 --repo_env=PY_PLATFORM_OVERRIDE=macosx_14_0_arm64 }
5353
python-version:
54-
- '3.8'
55-
- '3.9'
54+
# - '3.9'
5655
- '3.10'
57-
- '3.11'
56+
# - '3.11'
57+
# - '3.12'
58+
# - '3.13'
5859

5960
env:
6061
CC: ${{ matrix.cfg.cc }}
@@ -69,10 +70,14 @@ jobs:
6970
python-version: ${{ matrix.python-version }}
7071

7172
- name: Install Python Dependencies
72-
run: pip3 install --upgrade pip packaging check-wheel-contents
73+
run: |
74+
pip3 install --upgrade pip packaging check-wheel-contents setuptools
75+
pip list
7376
7477
- name: Build for Python ${{ matrix.python-version }}
75-
run: bazel --bazelrc=.bazelrc build --compilation_mode=opt --dynamic_mode=off --config=luajit ${{ matrix.cfg.config }} //dmlab2d:dmlab2d_wheel
78+
run: |
79+
bazel --version
80+
bazel --bazelrc=.bazelrc build --noenable_bzlmod --compilation_mode=opt --dynamic_mode=off --config=luajit ${{ matrix.cfg.config }} //dmlab2d:dmlab2d_wheel
7681
7782
- name: Get built wheel name
7883
working-directory: bazel-bin/dmlab2d

WORKSPACE

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ http_archive(
1717

1818
http_archive(
1919
name = "rules_cc",
20-
strip_prefix = "rules_cc-main",
21-
urls = ["https://github.com/bazelbuild/rules_cc/archive/main.zip"],
20+
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.17/rules_cc-0.0.17.tar.gz"],
21+
sha256 = "abc605dd850f813bb37004b77db20106a19311a96b2da1c92b789da529d28fe1",
22+
strip_prefix = "rules_cc-0.0.17",
2223
)
2324

2425
http_archive(

bazel/eigen.BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# Eigen is a C++ template library for linear algebra: vectors,
33
# matrices, and related algorithms.
44

5+
load("@rules_cc//cc:defs.bzl", "cc_library")
6+
57
licenses([
68
# Note: Eigen is an MPL2 library that includes GPL v3 and LGPL v2.1+ code.
79
# We've taken special care to not reference any restricted code.

bazel/lua5_1.BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Description:
22
# Build rule for Lua 5.1.
33

4+
load("@rules_cc//cc:defs.bzl", "cc_library")
5+
46
cc_library(
57
name = "lua5_1",
68
srcs = glob(

bazel/lua5_2.BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Description:
22
# Build rule for Lua 5.2.
33

4+
load("@rules_cc//cc:defs.bzl", "cc_library")
5+
46
cc_library(
57
name = "lua5_2",
68
srcs = glob(

bazel/luajit.BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Build rule for LuaJit.
33

44
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
5+
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
56

67
string_flag(
78
name = "target_arch",

bazel/png.BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Description:
22
# libpng is the official PNG reference library.
33

4+
load("@rules_cc//cc:defs.bzl", "cc_library")
5+
46
licenses(["notice"]) # BSD/MIT-like license
57

68
genrule(

bazel/pybind11.BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Description:
22
# Build rule for pybind11 2.2.4.
33

4+
load("@rules_cc//cc:defs.bzl", "cc_library")
5+
46
cc_library(
57
name = "pybind11",
68
hdrs = glob(

bazel/tree.BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# The tree package used to support Bazel, but no longer does so.
44
# This BUILD file is adapted from the last official version.
55

6+
load("@rules_cc//cc:defs.bzl", "cc_library")
7+
68
cc_binary(
79
name = "tree/_tree.so",
810
srcs = [

bazel/zlib.BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_library")
2+
13
package(default_visibility = ["//visibility:public"])
24

35
licenses(["notice"]) # BSD/MIT-like license (for zlib)

0 commit comments

Comments
 (0)