diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de9f262..59d0ab9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,42 @@ stages: - build - deploy +protoc_base: + image: vato.ddns.net:8083/gradle + stage: protoc + rules: + - changes: + - protobuf/* + script: + - ./gradlew :protobuf:generateProto + +protoc_python: + extends: protoc_base + rules: + - changes: + - pycar/* + - protobuf/* + script: + - ./gradlew :pycar:copyPythonCode + +protoc_swift_Car: + extends: protoc_base + rules: + - changes: + - SwiftyCar/* + - protobuf/* + script: + - ./gradlew :SwiftyCar:copySwiftCode + +protoc_swift_CarController: + extends: protoc_base + rules: + - changes: + - CarControlleriOS/* + - protobuf/* + script: + - ./gradlew :CarControlleriOS:copySwiftCode + build_pycar: image: vato.ddns.net:8083/python-infra:buster stage: build @@ -10,6 +46,8 @@ build_pycar: - changes: - pycar/* - protobuf/* + needs: + - protoc_python script: - cd pycar && python setup.py bdist_wheel && cd .. @@ -20,6 +58,8 @@ build_pycar_docker: - changes: - pycar/* - protobuf/* + needs: + - protoc_python script: - echo ${DOCKER_PASSWORD} | docker login vato.ddns.net:8083 --username ${DOCKER_USERNAME} --password-stdin - docker build -f pycar/Dockerfile --build-arg PYPI_USERNAME=${PYPI_USERNAME} --build-arg PYPI_PASSWORD=${PYPI_PASSWORD} -t vato.ddns.net:8082/pycar:latest pycar diff --git a/protobuf/grpc_plugins/protoc-gen-grpc-swift-linux-x86_64 b/protobuf/grpc_plugins/protoc-gen-grpc-swift-linux-x86_64 index 23b3561..5419c39 100755 Binary files a/protobuf/grpc_plugins/protoc-gen-grpc-swift-linux-x86_64 and b/protobuf/grpc_plugins/protoc-gen-grpc-swift-linux-x86_64 differ diff --git a/protobuf/grpc_plugins/protoc-gen-swift-linux-x86_64 b/protobuf/grpc_plugins/protoc-gen-swift-linux-x86_64 index 0d50aa8..9a23e21 100755 Binary files a/protobuf/grpc_plugins/protoc-gen-swift-linux-x86_64 and b/protobuf/grpc_plugins/protoc-gen-swift-linux-x86_64 differ