bazel updates (Neargye#291)

yssource · Aug 23, 2023 · 745bf36 · 745bf36
1 parent 40e12d6
commit 745bf36
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 54 deletions.
diff --git a/.bazelignore b/.bazelignore
@@ -0,0 +1,5 @@
+.git
+.github
+test
+doc
+cmake
diff --git a/.bazelrc b/.bazelrc
@@ -4,15 +4,6 @@ build --incompatible_use_platforms_repo_for_constraints
 build --enable_runfiles
 build --incompatible_strict_action_env
 
-build:linux --host_platform=@magic_enum//bazel/platforms:linux
-build:linux --platforms=@magic_enum//bazel/platforms:linux
-
-build:macos --host_platform=@magic_enum//bazel/platforms:macos
-build:macos --platforms=@magic_enum//bazel/platforms:macos
-
-build:windows --host_platform=@magic_enum//bazel/platforms:windows
-build:windows --platforms=@magic_enum//bazel/platforms:windows
-
 common:ci --announce_rc
 test:ci --test_output=errors
 build:ci --curses=no

diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.1.2
+6.3.2
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -38,4 +38,5 @@ jobs:
 
     - name: Bazel Test
       continue-on-error: true
+      working-directory: test
       run: bazelisk test //... --config=ci
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -75,4 +75,5 @@ jobs:
 
     - name: Bazel Test
       continue-on-error: true
+      working-directory: test
       run: bazelisk test //... --config=ci
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -44,4 +44,5 @@ jobs:
 
     - name: Bazel Test
       continue-on-error: true
+      working-directory: test
       run: bazelisk test //... --config=ci
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,8 +1,8 @@
-module(
-    name = "magic_enum",
-    version = "0.9.3",
-    compatibility_level = 0,
-)
-
-bazel_dep(name = "platforms", version = "0.0.6")
-bazel_dep(name = "rules_cc", version = "0.0.6")
+module(
+    name = "magic_enum",
+    version = "0.9.3",
+    compatibility_level = 0,
+)
+
+bazel_dep(name = "rules_cc", version = "0.0.8")
+bazel_dep(name = "bazel_skylib", version = "1.4.2")
diff --git a/bazel/copts.bzl b/bazel/copts.bzl
@@ -1,4 +1,11 @@
-COPTS = select({
-    "@bazel_tools//tools/cpp:msvc": ["/std:c++17", "/permissive-"],
-    "//conditions:default": ["-std=c++17"],
-})
+load("@bazel_skylib//lib:selects.bzl", "selects")
+
+COPTS = selects.with_or({
+    ("@rules_cc//cc/compiler:clang", "@rules_cc//cc/compiler:gcc", "@rules_cc//cc/compiler:mingw-gcc"): [
+        "-std=c++17",
+    ],
+    ("@rules_cc//cc/compiler:msvc-cl", "@rules_cc//cc/compiler:clang-cl"): [
+        "/std:c++17",
+        "/permissive-",
+    ],
+})
diff --git a/bazel/platforms/BUILD.bazel b/bazel/platforms/BUILD.bazel
diff --git a/test/MODULE.bazel b/test/MODULE.bazel
@@ -1,7 +1,6 @@
-module(name = "magic_enum_tests")
-
-bazel_dep(name = "magic_enum")
-bazel_dep(name = "platforms", version = "0.0.6")
-bazel_dep(name = "rules_cc", version = "0.0.6")
-
-local_path_override(module_name = "magic_enum", path = "..")
+module(name = "magic_enum_tests")
+
+bazel_dep(name = "magic_enum")
+bazel_dep(name = "rules_cc", version = "0.0.8")
+
+local_path_override(module_name = "magic_enum", path = "..")