Skip to content

Commit 2225d05

Browse files
ondysondys
committed
Revert "Draco v1.5.6 release.". Build was broken.
This reverts commit 295ea7c.
1 parent 295ea7c commit 2225d05

File tree

138 files changed

+2579
-5317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+2579
-5317
lines changed

‎.cmake-format.py‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
'POST_LINK_JS_SOURCES': '*',
1818
'FEATURES': '*',
1919
},
20-
'pargs': 0,
20+
'pargs': 0
2121
},
2222
'draco_add_executable': {
2323
'kwargs': {
@@ -32,7 +32,7 @@
3232
'OBJLIB_DEPS': '*',
3333
'LIB_DEPS': '*',
3434
},
35-
'pargs': 0,
35+
'pargs': 0
3636
},
3737
'draco_add_library': {
3838
'kwargs': {
@@ -49,59 +49,29 @@
4949
'LIB_DEPS': '*',
5050
'PUBLIC_INCLUDES': '*',
5151
},
52-
'pargs': 0,
52+
'pargs': 0
5353
},
5454
'draco_generate_emscripten_glue': {
5555
'kwargs': {
5656
'INPUT_IDL': '*',
5757
'OUTPUT_PATH': '*',
5858
},
59-
'pargs': 0,
59+
'pargs': 0
6060
},
6161
'draco_get_required_emscripten_flags': {
6262
'kwargs': {
6363
'FLAG_LIST_VAR_COMPILER': '*',
6464
'FLAG_LIST_VAR_LINKER': '*',
6565
},
66-
'pargs': 0,
66+
'pargs': 0
6767
},
6868
'draco_option': {
6969
'kwargs': {
7070
'NAME': '*',
7171
'HELPSTRING': '*',
7272
'VALUE': '*',
7373
},
74-
'pargs': 0,
75-
},
76-
# Rules for built in CMake commands and those from dependencies.
77-
'list': {
78-
'kwargs': {
79-
'APPEND': '*',
80-
'FILTER': '*',
81-
'FIND': '*',
82-
'GET': '*',
83-
'INSERT': '*',
84-
'JOIN': '*',
85-
'LENGTH': '*',
86-
'POP_BACK': '*',
87-
'POP_FRONT': '*',
88-
'PREPEND': '*',
89-
'REMOVE_DUPLICATES': '*',
90-
'REMOVE_ITEM': '*',
91-
'REVERSE': '*',
92-
'SORT': '*',
93-
'SUBLIST': '*',
94-
'TRANSFORM': '*',
95-
},
96-
},
97-
'protobuf_generate': {
98-
'kwargs': {
99-
'IMPORT_DIRS': '*',
100-
'LANGUAGE': '*',
101-
'OUT_VAR': '*',
102-
'PROTOC_OUT_DIR': '*',
103-
'PROTOS': '*',
104-
},
74+
'pargs': 0
10575
},
10676
}
10777

‎.github/workflows/ci.yml‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ jobs:
105105
cmake .. -G "Unix Makefiles" \
106106
-DBUILD_SHARED_LIBS=ON \
107107
-DCMAKE_BUILD_TYPE=Release \
108-
-DCMAKE_C_COMPILER=gcc-10 \
109-
-DCMAKE_CXX_COMPILER=g++-10 \
108+
-DCMAKE_C_COMPILER=gcc \
109+
-DCMAKE_CXX_COMPILER=g++ \
110110
-DDRACO_TESTS=ON
111111
cmake_build_command: cmake --build . -- -j2
112112
draco_test_command: ./draco_tests
@@ -116,8 +116,32 @@ jobs:
116116
cmake .. -G "Unix Makefiles" \
117117
-DBUILD_SHARED_LIBS=ON \
118118
-DCMAKE_BUILD_TYPE=Release \
119-
-DCMAKE_C_COMPILER=gcc-10 \
120-
-DCMAKE_CXX_COMPILER=g++-10 \
119+
-DCMAKE_C_COMPILER=gcc \
120+
-DCMAKE_CXX_COMPILER=g++ \
121+
-DDRACO_TESTS=ON \
122+
-DDRACO_TRANSCODER_SUPPORTED=ON
123+
cmake_build_command: cmake --build . -- -j2
124+
draco_test_command: ./draco_tests
125+
126+
- test_name: ubuntu22-make-clang14-release-static
127+
os: ubuntu-22.04
128+
cmake_configure_command: |-
129+
cmake .. -G "Unix Makefiles" \
130+
-DBUILD_SHARED_LIBS=OFF \
131+
-DCMAKE_BUILD_TYPE=Release \
132+
-DCMAKE_C_COMPILER=clang-14 \
133+
-DCMAKE_CXX_COMPILER=clang++-14 \
134+
-DDRACO_TESTS=ON
135+
cmake_build_command: cmake --build . -- -j2
136+
draco_test_command: ./draco_tests
137+
- test_name: ubuntu22-make-clang14-release-static-with-transcoder
138+
os: ubuntu-22.04
139+
cmake_configure_command: |-
140+
cmake .. -G "Unix Makefiles" \
141+
-DBUILD_SHARED_LIBS=OFF \
142+
-DCMAKE_BUILD_TYPE=Release \
143+
-DCMAKE_C_COMPILER=clang-14 \
144+
-DCMAKE_CXX_COMPILER=clang++-14 \
121145
-DDRACO_TESTS=ON \
122146
-DDRACO_TRANSCODER_SUPPORTED=ON
123147
cmake_build_command: cmake --build . -- -j2
@@ -129,8 +153,8 @@ jobs:
129153
cmake .. -G "Unix Makefiles" \
130154
-DBUILD_SHARED_LIBS=OFF \
131155
-DCMAKE_BUILD_TYPE=Release \
132-
-DCMAKE_C_COMPILER=gcc-10 \
133-
-DCMAKE_CXX_COMPILER=g++-10 \
156+
-DCMAKE_C_COMPILER=gcc \
157+
-DCMAKE_CXX_COMPILER=g++ \
134158
-DDRACO_TESTS=ON
135159
cmake_build_command: cmake --build . -- -j2
136160
draco_test_command: ./draco_tests
@@ -140,8 +164,8 @@ jobs:
140164
cmake .. -G "Unix Makefiles" \
141165
-DBUILD_SHARED_LIBS=OFF \
142166
-DCMAKE_BUILD_TYPE=Release \
143-
-DCMAKE_C_COMPILER=gcc-10 \
144-
-DCMAKE_CXX_COMPILER=g++-10 \
167+
-DCMAKE_C_COMPILER=gcc \
168+
-DCMAKE_CXX_COMPILER=g++ \
145169
-DDRACO_TESTS=ON \
146170
-DDRACO_TRANSCODER_SUPPORTED=ON
147171
cmake_build_command: cmake --build . -- -j2
@@ -165,7 +189,8 @@ jobs:
165189
-DDRACO_TESTS=ON \
166190
-DDRACO_TRANSCODER_SUPPORTED=ON
167191
cmake_build_command: cmake --build . --config Release -- -m:2
168-
draco_test_command: Release/draco_tests
192+
# TODO(https://github.com/google/draco/issues/938): Flaking on this target.
193+
draco_test_command: Release/draco_tests --gtest_filter=-GltfDecoderTest.TestLoadUnsupportedTexCoordAttributes
169194

170195
- test_name: windows-msvc-release-static
171196
os: windows-2019
@@ -185,7 +210,8 @@ jobs:
185210
-DDRACO_TESTS=ON \
186211
-DDRACO_TRANSCODER_SUPPORTED=ON
187212
cmake_build_command: cmake --build . --config Release -- -m:2
188-
draco_test_command: Release/draco_tests
213+
# TODO(https://github.com/google/draco/issues/938): Flaking on this target.
214+
draco_test_command: Release/draco_tests --gtest_filter=-GltfDecoderTest.TestLoadUnsupportedTexCoordAttributes
189215

190216
- test_name: windows-make-release-shared
191217
os: windows-2019
@@ -209,7 +235,8 @@ jobs:
209235
-DDRACO_TESTS=ON \
210236
-DDRACO_TRANSCODER_SUPPORTED=ON
211237
cmake_build_command: cmake --build . -- -j2
212-
draco_test_command: ./draco_tests
238+
# TODO(https://github.com/google/draco/issues/938): Flaking on this target.
239+
draco_test_command: ./draco_tests --gtest_filter=-GltfDecoderTest.TestLoadUnsupportedTexCoordAttributes
213240

214241
- test_name: windows-make-release-static
215242
os: windows-2019
@@ -233,7 +260,8 @@ jobs:
233260
-DDRACO_TESTS=ON \
234261
-DDRACO_TRANSCODER_SUPPORTED=ON
235262
cmake_build_command: cmake --build . -- -j2
236-
draco_test_command: ./draco_tests
263+
# TODO(https://github.com/google/draco/issues/938): Flaking on this target.
264+
draco_test_command: ./draco_tests --gtest_filter=-GltfDecoderTest.TestLoadUnsupportedTexCoordAttributes
237265

238266
name: test-${{ matrix.test_name }}
239267
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)