Skip to content

Commit

Permalink
Merge pull request #9 from theteamatx/feature/remove_submodules_signed
Browse files Browse the repository at this point in the history
Rewired to public git repos, removed submodules
  • Loading branch information
mikael-s-persson authored Oct 9, 2023
2 parents e9deacd + aed7fb2 commit 34f7732
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 36 deletions.
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: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +0,0 @@
[submodule "third_party/genit"]
path = third_party/genit
url = https://github.com/theteamatx/x-edr-genit.git
[submodule "third_party/eigenmath"]
path = third_party/eigenmath
url = https://github.com/theteamatx/x-edr-eigenmath.git
26 changes: 19 additions & 7 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,29 @@ protobuf_deps()
http_archive(
name = "eigen",
build_file = "//third_party:eigen.BUILD",
sha256 = "8586084f71f9bde545ee7fa6d00288b264a2b7ac3607b974e54d13e7162c1c72",
url = "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz",
strip_prefix="eigen-3.4.0",
)

local_repository(
name = "genit",
path = "third_party/genit",
# GenIt
_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,
],
)

local_repository(
name = "eigenmath",
path = "third_party/eigenmath",
# 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,
],
)

36 changes: 18 additions & 18 deletions diff_drive/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ cc_library(
],
deps = [
":interval",
"@eigenmath//eigenmath",
"@genit//genit:iterators",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/log",
"@com_google_absl//absl/strings:str_format",
"@x_edr_eigenmath//eigenmath",
"@x_edr_genit//genit:iterators",
],
)

Expand All @@ -89,8 +89,8 @@ cc_library(
deps = [
":base_feedback_control_config_cc_proto",
":differential_drive",
"@eigenmath//eigenmath",
"@com_google_absl//absl/types:span",
"@x_edr_eigenmath//eigenmath",
],
)

Expand All @@ -100,7 +100,7 @@ proto_library(
"diff_drive.proto",
],
deps = [
"@eigenmath//eigenmath:eigenmath_proto",
"@x_edr_eigenmath//eigenmath:eigenmath_proto",
],
)

Expand All @@ -120,11 +120,11 @@ cc_library(
deps = [
":diff_drive_cc_proto",
":differential_drive",
"@eigenmath//eigenmath:eigenmath_cc_proto",
"@eigenmath//eigenmath:conversions",
"@com_google_absl//absl/log",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings",
"@x_edr_eigenmath//eigenmath:eigenmath_cc_proto",
"@x_edr_eigenmath//eigenmath:conversions",
],
)

Expand All @@ -137,9 +137,9 @@ cc_test(
":diff_drive_cc_proto",
":diff_drive_conversion",
":differential_drive",
"@eigenmath//eigenmath:eigenmath_cc_proto",
"@com_google_protobuf//:protobuf",
"@com_google_googletest//:gtest_main",
"@x_edr_eigenmath//eigenmath:eigenmath_cc_proto",
],
)

Expand Down Expand Up @@ -186,8 +186,8 @@ cc_library(
],
deps = [
":differential_drive",
"@eigenmath//eigenmath:matchers",
"@com_google_googletest//:gtest",
"@x_edr_eigenmath//eigenmath:matchers",
],
)

Expand Down Expand Up @@ -233,10 +233,10 @@ cc_test(
":differential_drive",
":matchers",
":test_fixtures",
"@eigenmath//eigenmath:matchers",
"@eigenmath//eigenmath:sampling",
"@com_google_googletest//:gtest_main",
"@com_google_absl//absl/flags:flag",
"@x_edr_eigenmath//eigenmath:matchers",
"@x_edr_eigenmath//eigenmath:sampling",
],
)

Expand Down Expand Up @@ -282,8 +282,8 @@ cc_test(
deps = [
":differential_drive",
":test_fixtures",
"@eigenmath//eigenmath:matchers",
"@com_google_googletest//:gtest_main",
"@x_edr_eigenmath//eigenmath:matchers",
],
)

Expand All @@ -294,14 +294,14 @@ cc_test(
],
deps = [
":differential_drive",
"@eigenmath//eigenmath",
"@eigenmath//eigenmath:matchers",
"@eigenmath//eigenmath:sampling",
"@genit//genit:iterators",
"@com_google_benchmark//:benchmark",
"@com_google_googletest//:gtest_main",
"@com_google_absl//absl/random:distributions",
"@com_google_absl//absl/strings:str_format",
"@x_edr_eigenmath//eigenmath",
"@x_edr_eigenmath//eigenmath:matchers",
"@x_edr_eigenmath//eigenmath:sampling",
"@x_edr_genit//genit:iterators",
],
)

Expand Down Expand Up @@ -336,8 +336,8 @@ cc_test(
],
deps = [
":motion_control",
"@eigenmath//eigenmath:matchers",
"@com_google_googletest//:gtest_main",
"@x_edr_eigenmath//eigenmath:matchers",
],
)

Expand All @@ -349,8 +349,8 @@ cc_test(
deps = [
":differential_drive",
":motion_control",
"@eigenmath//eigenmath:matchers",
"@com_google_googletest//:gtest_main",
"@x_edr_eigenmath//eigenmath:matchers",
],
)

Expand All @@ -362,7 +362,7 @@ cc_test(
deps = [
":differential_drive",
":motion_control",
"@eigenmath//eigenmath:matchers",
"@com_google_googletest//:gtest_main",
"@x_edr_eigenmath//eigenmath:matchers",
],
)
1 change: 0 additions & 1 deletion third_party/eigenmath
Submodule eigenmath deleted from 708042
1 change: 0 additions & 1 deletion third_party/genit
Submodule genit deleted from 542a05

0 comments on commit 34f7732

Please sign in to comment.