Merge branch 'update-ose-and-mantleapi' into 'develop' (afbd3c2d) · Commits · Eclipse Projects / Eclipse openpass / opSimulation

sim/src/core/opSimulation/framework/environment.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -200,7 +200,10 @@ public:
		{
		strategy->movement_domain = mantle_api::MovementDomain::kLateral;
		}

		else
		{
		strategy->movement_domain = mantle_api::MovementDomain::kBoth;
		}
		std::for_each(begin(polyline),
		end(polyline),
		[&](auto &point)

+2 −2

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ spec:
		}
		steps {
		script {
		env.IMAGE_TAG = "v1.1.7"
		env.IMAGE_TAG = "v1.1.9"
		}
		build job: 'Docker-build', parameters: [string(name: 'IMAGE_NAME', value: "${env.IMAGE_NAME}"),
		string(name: 'IMAGE_TAG', value:"${env.IMAGE_TAG}"),
		@@ -82,7 +82,7 @@ spec:
		}
		steps {
		script {
		env.IMAGE_TAG = "v1.1.7"
		env.IMAGE_TAG = "v1.1.9"
		}
		}
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -10,8 +10,8 @@ libiconv/1.17
		libxml2/2.12.5
		protobuf-shared/3.20.0
		units/2.3.3
		open-simulation-interface/3.6.0
		mantleapi/v5.0.0
		open-simulation-interface/3.7.0
		mantleapi/v5.1.0
		yase/0.1
		openscenario_api/v1.3.1
		openscenario_engine/commitid
		@@ -58,8 +58,8 @@ boost/*:without_url=True
		boost/*:without_wave=True
		protobuf/*:debug_suffix=False
		protobuf-shared/*:debug_suffix=False
		openscenario_engine/*:commit_id_value=e83a23001e12eea2ac70fdd54b6fcfd30a8762ed
		openscenario_engine/*:MantleAPI_version=v5.0.0
		openscenario_engine/*:commit_id_value=6d4b0919262cbee1199f3537be0521145952dd8c
		openscenario_engine/*:MantleAPI_version=v5.1.0
		openscenario_engine/*:Yase_version=0.1

		[generators]

+4 −0

Original line number	Diff line number	Diff line
		@@ -29,5 +29,9 @@ sources:
		url: https://gitlab.eclipse.org/eclipse/openpass/mantle-api.git
		sha256: "f2447b55108e1ee53f659e626942bfa7518d3319"

		"v5.1.0":
		url: https://gitlab.eclipse.org/eclipse/openpass/mantle-api.git
		sha256: "34851cb3686ec65aa4a9107bf91773a5653ce20b"

		"commitid":
		url: https://gitlab.eclipse.org/eclipse/openpass/mantle-api.git

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ class MantleAPIConan(ConanFile):
		"MantleAPI_TEST":False,
		"commit_id_value": None}

		exports_sources = "*"
		no_copy_source = False
		short_paths = True
		commit = None