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 fb80abb2..2cc521fa 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 overlays tests +mandatory_targets: clean json json-noexpand franca yaml csv graphql ddsidl id jsonschema 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 @@ -52,9 +52,6 @@ overlays: prepare_binary: cd ${TOOLSDIR}/binary && $(MAKE) -tests: prepare_binary - PYTHONPATH=${TOOLSDIR} pytest - binary: prepare_binary vspec export binary ${COMMON_ARGS} ${COMMON_VSPEC_ARG} --bintool-dll ${TOOLSDIR}/binary/binarytool.so -o vss_rel_$$(cat VERSION).binary @@ -72,5 +69,4 @@ id: vspec export id ${COMMON_ARGS} ${COMMON_VSPEC_ARG} -o vss_rel_$$(cat VERSION).vspec clean: - cd ${TOOLSDIR}/binary && $(MAKE) clean rm -f vss_rel_* diff --git a/vss-tools b/vss-tools deleted file mode 160000 index 50b29494..00000000 --- a/vss-tools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 50b2949476849d1a050c4ec58108416642e4d0c0