Drop workspace support: It creates too many issues in too many configurations.

.bcr/patches/bazelmod.patch

@@ -11,5 +11,5 @@ index c298a32..658794e 100644
 +# include("//bazelmod:dev.MODULE.bazel")
 +# include("//bazelmod:llvm.MODULE.bazel")
 
- bazel_dep(name = "bazel_skylib", version = "1.7.1")
- bazel_dep(name = "rules_cc", version = "0.1.1")
+ bazel_dep(name = "bazel_skylib", version = "1.8.2")
+ bazel_dep(name = "platforms", version = "1.0.0")

.github/workflows/bazelmod.patch

@@ -11,8 +11,8 @@ index c298a32..658794e 100644
 +# include("//bazelmod:dev.MODULE.bazel")
 +# include("//bazelmod:llvm.MODULE.bazel")
 
- bazel_dep(name = "bazel_skylib", version = "1.7.1")
- bazel_dep(name = "rules_cc", version = "0.1.1")
+ bazel_dep(name = "bazel_skylib", version = "1.8.2")
+ bazel_dep(name = "platforms", version = "1.0.0")
 diff --git a/mbo/mope/mope.bzl b/mbo/mope/mope.bzl
 index d80d788..7aeac41 100644
 --- a/mbo/mope/mope.bzl

.github/workflows/main.yml

@@ -19,18 +19,11 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        bazel_mode: [bzlmod, workspace]
         compiler: [gcc]
         gcc_version: [12, 13, 14]
         bazel_config: [asan, cpp23, opt]
         # Using `include` does not make the options show up in the generated config names...
         exclude:
-          - bazel_mode: bzlmod
-            gcc_version: 12
-          - bazel_mode: workspace
-            gcc_version: 14
-          - bazel_mode: workspace
-            gcc_version: 13
           - bazel_config: asan
             gcc_version: 13
           - bazel_config: asan
@@ -44,7 +37,6 @@ jobs:
     with:
       continue-on-error: false
       os: ${{ matrix.os }}
-      bazel_mode: ${{ matrix.bazel_mode }}
       compiler: ${{ matrix.compiler }}
       gcc_version: ${{ matrix.gcc_version }}
       bazel_config: ${{ matrix.bazel_config }}
@@ -55,7 +47,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-15]
-        bazel_mode: [bzlmod]
         compiler: [gcc, native, clang]
         gcc_version: [13]
         llvm_version: [16.0.4]
@@ -71,7 +62,6 @@ jobs:
     with:
       continue-on-error: false
       os: ${{ matrix.os }}
-      bazel_mode: ${{ matrix.bazel_mode }}
       compiler: ${{ matrix.compiler }}
       gcc_version: ${{ matrix.gcc_version }}
       llvm_version: ${{ matrix.llvm_version }}
@@ -84,7 +74,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-15]
-        bazel_mode: [bzlmod]
         compiler: [clang]
         # MacOS-15: Clang 16.0.0
         # MacOS-25: Clang 17.0.0
@@ -114,7 +103,6 @@ jobs:
     with:
       continue-on-error: true
       os: ${{ matrix.os }}
-      bazel_mode: ${{ matrix.bazel_mode }}
       compiler: ${{ matrix.compiler }}
       llvm_version: ${{ matrix.llvm_version }}
       bazel_config: ${{ matrix.bazel_config }}

.github/workflows/test.yml

@@ -26,10 +26,6 @@ on:
         description: 'The operating system the tests will be run on.'
         type: string
         default: ubuntu-latest
-      bazel_mode:
-        description: 'The Bazel operation mode (bzlmod, workspace).'
-        type: string
-        default: bzlmod
       compiler:
         description: 'The compiler to use (clang, gcc).'
         type: string
@@ -56,7 +52,7 @@ on:
         default: ''
 
 env:
-  CACHE_KEY_PREFIX: ${{inputs.os}}-${{inputs.bazel_mode}}_${{inputs.compiler}}_${{inputs.compiler == 'clang' && inputs.llvm_version || ''}}_${{inputs.compiler == 'gcc' && inputs.gcc_version || ''}}_${{inputs.bazel_config}}_${{inputs.module_version}}
+  CACHE_KEY_PREFIX: ${{inputs.os}}-bzlmod_${{inputs.compiler}}_${{inputs.compiler == 'clang' && inputs.llvm_version || ''}}_${{inputs.compiler == 'gcc' && inputs.gcc_version || ''}}_${{inputs.bazel_config}}_${{inputs.module_version}}
 
 jobs:
   test:
@@ -92,14 +88,6 @@ jobs:
           CACHE_ROOT=~/.cache
           BAZEL_INIT+=("--output_user_root=${CACHE_ROOT}/bazel")
           BAZEL_ARGS+=("--repository_cache=${CACHE_ROOT}/bazel_repo-cache")
-          if [ "${{inputs.bazel_mode}}" == "workspace" ]; then
-            BAZEL_ARGS+=("--noenable_bzlmod" "--enable_workspace")
-          elif [ "${{inputs.bazel_mode}}" == "bzlmod" ]; then
-            BAZEL_ARGS+=("--enable_bzlmod" "--noenable_workspace")
-          else
-            echo "ERROR: Matrix/Input var 'bazel_mode' must be one of [bzlmod, workspace]."
-            exit 1
-          fi
           if [ "${{inputs.compiler}}" == "clang" ]; then
             BAZEL_ARGS+=("--config=clang")
             unset CC

CHANGELOG.md

@@ -50,6 +50,7 @@
 * Fixed bug in `mbo::strings::ParseString` with access past end of `string_view` for illegal hex and oct escape sequences (introduced in 0.9.0).
 * Updated various dependencies.
 * Renamed old dependency naming styles to new (matching bzlmod and other deps' needs) styles where possible.
+* Removed WORKSPACE support.
 
 # 0.9.0
 

WORKSPACE

@@ -13,26 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-workspace(name = "com_helly25_mbo")
-
-load("//bzl/workspace:load_modules.bzl", "helly25_mbo_load_modules")
-
-helly25_mbo_load_modules()
-
-load("//bzl/workspace:init_modules.bzl", "helly25_mbo_init_modules")
-
-helly25_mbo_init_modules()
-
-################################################################################
-
-load("//bzl/workspace:load_extras.bzl", "helly25_mbo_load_extras")
-
-helly25_mbo_load_extras()  # Adds Hedron + LLVM
-
-load("//bzl/workspace:init_extras.bzl", "helly25_mbo_init_extras")
-
-helly25_mbo_init_extras()  # Init Hedron + LLVM
-
-load("//bzl/workspace:init_extras_llvm.bzl", "helly25_mbo_init_extras_llvm")
-
-helly25_mbo_init_extras_llvm()  # Init LLVM/Part 2
+# NOT SUPPORTED