Fixup

wpilibsuite · Aug 25, 2024 · a5dddc2 · a5dddc2
1 parent 15e69a8
commit a5dddc2
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 24 deletions.
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
@@ -74,7 +74,6 @@ jobs:
           - config: "asan"
           - config: "ubsan"
     runs-on: ubuntu-22.04
-    container: wpilib/ubuntu-base:22.04
     name: "Sanitizer ${{ matrix.config }}"
     steps:
       - uses: actions/checkout@v4
@@ -91,7 +90,6 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: 1.15.x
-        id: go
 
       - name: Install Buildifier
         run: |

diff --git a/cameraserver/BUILD.bazel b/cameraserver/BUILD.bazel
@@ -17,22 +17,22 @@ java_library(
 )
 
 cc_binary(
-    name = "DevMain-cpp",
+    name = "DevMain-Cpp",
     srcs = ["src/dev/native/cpp/main.cpp"],
     deps = [
     ],
 )
 
 java_binary(
-    name = "DevMain-java",
+    name = "DevMain-Java",
     srcs = ["src/dev/java/edu/wpi/first/cameraserver/DevMain.java"],
     main_class = "edu.wpi.first.cameraserver.DevMain",
     deps = [
     ],
 )
 
 java_binary(
-    name = "multiCameraServer",
+    name = "multiCameraServer-java",
     srcs = ["multiCameraServer/src/main/java/edu/wpi/Main.java"],
     main_class = "edu.wpi.Main",
     deps = [

diff --git a/cscore/BUILD.bazel b/cscore/BUILD.bazel
@@ -11,7 +11,7 @@ java_library(
 )
 
 java_binary(
-    name = "DevMain",
+    name = "DevMain-Java",
     srcs = ["src/dev/java/edu/wpi/first/cscore/DevMain.java"],
     main_class = "edu.wpi.first.cscore.DevMain",
     deps = [

diff --git a/hal/BUILD.bazel b/hal/BUILD.bazel
@@ -90,15 +90,15 @@ cc_test(
 )
 
 cc_binary(
-    name = "DevMain",
+    name = "DevMain-Cpp",
     srcs = ["src/dev/native/cpp/main.cpp"],
     deps = [
         ":wpiHal.static",
     ],
 )
 
 java_binary(
-    name = "DevMain-java",
+    name = "DevMain-Java",
     srcs = ["src/dev/java/edu/wpi/first/hal/DevMain.java"],
     main_class = "edu.wpi.first.hal.DevMain",
     deps = [

diff --git a/ntcore/BUILD.bazel b/ntcore/BUILD.bazel
@@ -64,7 +64,7 @@ java_library(
 )
 
 cc_test(
-    name = "ntcore-test",
+    name = "ntcore-cpp-test",
     size = "small",
     srcs = glob([
         "src/test/native/**/*.cpp",
@@ -83,15 +83,15 @@ cc_test(
 )
 
 cc_binary(
-    name = "DevMain-cpp",
+    name = "DevMain-Cpp",
     srcs = ["src/dev/native/cpp/main.cpp"],
     deps = [
         ":ntcore.static",
     ],
 )
 
 java_binary(
-    name = "DevMain-java",
+    name = "DevMain-Java",
     srcs = ["src/dev/java/edu/wpi/first/ntcore/DevMain.java"],
     main_class = "edu.wpi.first.ntcore.DevMain",
     deps = [

diff --git a/shared/bazel/compiler_flags/linux_flags.rc b/shared/bazel/compiler_flags/linux_flags.rc
@@ -11,4 +11,4 @@ build:linux --copt=-Wextra
 build:linux --copt=-Werror
 
 # Not in nativetools
-build:linux --copt=-Wno-deprecated-enum-enum-conversion
+build:linux --cxxopt=-Wno-deprecated-enum-enum-conversion
diff --git a/wpilibj/BUILD.bazel b/wpilibj/BUILD.bazel
@@ -34,14 +34,14 @@ java_library(
 )
 
 cc_binary(
-    name = "DevMain-cpp",
+    name = "DevMain-Cpp",
     srcs = ["src/dev/native/cpp/main.cpp"],
     deps = [
     ],
 )
 
 java_binary(
-    name = "DevMain-java",
+    name = "DevMain-Java",
     srcs = ["src/dev/java/edu/wpi/first/wpilibj/DevMain.java"],
     main_class = "edu.wpi.first.wpilibj.DevMain",
     deps = [
@@ -77,10 +77,3 @@ filegroup(
     ],
     visibility = ["//visibility:public"],
 )
-
-java_library(
-    name = "resources",
-    testonly = True,
-    resources = glob(["src/test/resources/**"]),
-    visibility = ["//wpilibj/src/test:__subpackages__"],
-)
diff --git a/wpinet/BUILD.bazel b/wpinet/BUILD.bazel
@@ -141,7 +141,7 @@ java_library(
 )
 
 cc_test(
-    name = "wpinet-test",
+    name = "wpinet-cpp-test",
     size = "small",
     srcs = glob([
         "src/test/native/**/*.cpp",
@@ -164,7 +164,7 @@ cc_binary(
 )
 
 java_binary(
-    name = "DevMain-Java",
+    name = "DevMain-java",
     srcs = ["src/dev/java/edu/wpi/first/net/DevMain.java"],
     main_class = "edu.wpi.first.net.DevMain",
     deps = [

diff --git a/wpiutil/BUILD.bazel b/wpiutil/BUILD.bazel
@@ -185,7 +185,7 @@ cc_library(
 )
 
 cc_test(
-    name = "wpiutil-test",
+    name = "wpiutil-cpp-test",
     size = "small",
     srcs = glob(["src/test/native/cpp/**"]),
     linkstatic = True,