Skip to content

Commit d8efb63

Browse files
vkreschjdsika
authored andcommitted
Remove redundant build3 proto3 syntax check (#361)
* Remove redundant build3 proto3 syntax check * Added docu note proto3 support * Fix typo
1 parent cadbfe6 commit d8efb63

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

.travis.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,6 @@ jobs:
9191
- doxygen
9292
- cd ..
9393
- python3 -m unittest discover tests
94-
- mv VERSION.SAVED VERSION
95-
- sh convert-to-proto3.sh
96-
- mkdir -p build3
97-
- cd build3
98-
- cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install ..
99-
- cmake --build .
100-
- cd ..
10194

10295
- script:
10396
- cd "${TRAVIS_BUILD_DIR}"
@@ -123,13 +116,6 @@ jobs:
123116
- doxygen
124117
- cd ..
125118
- python3 -m unittest discover tests
126-
- mv VERSION.SAVED VERSION
127-
- sh convert-to-proto3.sh
128-
- mkdir -p build3
129-
- cd build3
130-
- cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install ..
131-
- cmake --build .
132-
- cd ..
133119
name: 'Test protobuf 3.0.0 syntax'
134120

135121
- stage: deploy
@@ -155,13 +141,6 @@ jobs:
155141
- doxygen
156142
- cd ..
157143
- python3 -m unittest discover tests
158-
- mv VERSION.SAVED VERSION
159-
- sh convert-to-proto3.sh
160-
- mkdir -p build3
161-
- cd build3
162-
- cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install ..
163-
- cmake --build .
164-
- cd ..
165144

166145
# Deploy the documentation on github (only for master branch).
167146
deploy:

doc/description.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ all proto files to proto3 syntax. If this is run prior to building, the
6464
resulting libraries will use proto3, with the on-the-wire format
6565
remaining compatible between proto2 and proto3 libraries.
6666

67+
.. note::
68+
In the current OSI proto2 files there are no "required" fields or "[default = xx] values assigned.
69+
This is intentional since the use is prohibited for now. The reason for that is the conversion from proto2 to proto3 which would require to remove defaults or required attributes and therefore change the meaning of the proto file (and thus also the valid on-the-wire protocol) silently, and is thus dangerous.
70+
6771
OSI Trace Files
6872
---------------
6973

0 commit comments

Comments
 (0)