From a6e7beff23c8e5be3623dd5a24aed43e312afa1e Mon Sep 17 00:00:00 2001 From: Sebastian Schildt Date: Tue, 20 Aug 2024 16:57:24 +0200 Subject: [PATCH] Remove vss-tools submodule and update CI Signed-off-by: Sebastian Schildt --- .github/workflows/buildcheck.yml | 3 +-- .gitmodules | 3 --- Makefile | 4 ++-- vss-tools | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 160000 vss-tools diff --git a/.github/workflows/buildcheck.yml b/.github/workflows/buildcheck.yml index 384a1cba..aa639255 100644 --- a/.github/workflows/buildcheck.yml +++ b/.github/workflows/buildcheck.yml @@ -20,11 +20,10 @@ jobs: python -V python -m pip --quiet --no-input install --upgrade pip python -m pip --quiet --no-input install --upgrade wheel - cd vss-tools - pip install -e . pip install pytest # idlc currently used both during python test and later in this script pip install cyclonedds + pip install git+https://github.com/COVESA/vss-tools@master sudo apt install -y protobuf-compiler echo done! diff --git a/.gitmodules b/.gitmodules index d7413a1a..57b85245 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "vss-tools"] - path = vss-tools - url = https://github.com/covesa/vss-tools [submodule "docs-gen/themes/hugo-theme-relearn"] path = docs-gen/themes/hugo-theme-relearn url = https://github.com/McShelby/hugo-theme-relearn.git diff --git a/Makefile b/Makefile index 0fb283a1..c784accd 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ all: clean mandatory_targets optional_targets # All mandatory targets that shall be built and pass on each pull request for # vehicle-signal-specification or vss-tools -mandatory_targets: clean json json-noexpand franca yaml binary csv graphql ddsidl id jsonschema apigear samm overlays tests +mandatory_targets: clean json json-noexpand franca yaml binary csv graphql ddsidl id jsonschema apigear samm overlays # Additional targets that shall be built by travis, but where it is not mandatory # that the builds shall pass. @@ -16,7 +16,7 @@ mandatory_targets: clean json json-noexpand franca yaml binary csv graphql ddsid # from time to time # Can be run from e.g. travis with "make -k optional_targets || true" to continue # even if errors occur and not do not halt travis build if errors occur -optional_targets: clean protobuf ttl +optional_targets: clean protobuf ttl binary TOOLSDIR?=./vss-tools COMMON_ARGS=-u ./spec/units.yaml --strict diff --git a/vss-tools b/vss-tools deleted file mode 160000 index 9daa7a93..00000000 --- a/vss-tools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9daa7a93dd51a16ac37bab86006d136344e4092d