Revert "Draco v1.5.6 release.". Build was broken.

This reverts commit 295ea7c.
google · Feb 6, 2023 · 2225d05 · 2225d05
1 parent 295ea7c
commit 2225d05
Show file tree

Hide file tree

Showing 138 changed files with 2,579 additions and 5,317 deletions.
diff --git a/.cmake-format.py b/.cmake-format.py
@@ -17,7 +17,7 @@
               'POST_LINK_JS_SOURCES': '*',
               'FEATURES': '*',
           },
-          'pargs': 0,
+          'pargs': 0
       },
       'draco_add_executable': {
           'kwargs': {
@@ -32,7 +32,7 @@
               'OBJLIB_DEPS': '*',
               'LIB_DEPS': '*',
           },
-          'pargs': 0,
+          'pargs': 0
       },
       'draco_add_library': {
           'kwargs': {
@@ -49,59 +49,29 @@
               'LIB_DEPS': '*',
               'PUBLIC_INCLUDES': '*',
           },
-          'pargs': 0,
+          'pargs': 0
       },
       'draco_generate_emscripten_glue': {
           'kwargs': {
               'INPUT_IDL': '*',
               'OUTPUT_PATH': '*',
           },
-          'pargs': 0,
+          'pargs': 0
       },
       'draco_get_required_emscripten_flags': {
           'kwargs': {
               'FLAG_LIST_VAR_COMPILER': '*',
               'FLAG_LIST_VAR_LINKER': '*',
           },
-          'pargs': 0,
+          'pargs': 0
       },
       'draco_option': {
           'kwargs': {
               'NAME': '*',
               'HELPSTRING': '*',
               'VALUE': '*',
           },
-          'pargs': 0,
-      },
-      # Rules for built in CMake commands and those from dependencies.
-      'list': {
-          'kwargs': {
-              'APPEND': '*',
-              'FILTER': '*',
-              'FIND': '*',
-              'GET': '*',
-              'INSERT': '*',
-              'JOIN': '*',
-              'LENGTH': '*',
-              'POP_BACK': '*',
-              'POP_FRONT': '*',
-              'PREPEND': '*',
-              'REMOVE_DUPLICATES': '*',
-              'REMOVE_ITEM': '*',
-              'REVERSE': '*',
-              'SORT': '*',
-              'SUBLIST': '*',
-              'TRANSFORM': '*',
-          },
-      },
-      'protobuf_generate': {
-        'kwargs': {
-            'IMPORT_DIRS': '*',
-            'LANGUAGE': '*',
-            'OUT_VAR': '*',
-            'PROTOC_OUT_DIR': '*',
-            'PROTOS': '*',
-        },
+          'pargs': 0
       },
   }
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -105,8 +105,8 @@ jobs:
               cmake .. -G "Unix Makefiles" \
                 -DBUILD_SHARED_LIBS=ON \
                 -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_C_COMPILER=gcc-10 \
-                -DCMAKE_CXX_COMPILER=g++-10 \
+                -DCMAKE_C_COMPILER=gcc \
+                -DCMAKE_CXX_COMPILER=g++ \
                 -DDRACO_TESTS=ON
             cmake_build_command: cmake --build . -- -j2
             draco_test_command: ./draco_tests
@@ -116,8 +116,32 @@ jobs:
               cmake .. -G "Unix Makefiles" \
                 -DBUILD_SHARED_LIBS=ON \
                 -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_C_COMPILER=gcc-10 \
-                -DCMAKE_CXX_COMPILER=g++-10 \
+                -DCMAKE_C_COMPILER=gcc \
+                -DCMAKE_CXX_COMPILER=g++ \
+                -DDRACO_TESTS=ON \
+                -DDRACO_TRANSCODER_SUPPORTED=ON
+            cmake_build_command: cmake --build . -- -j2
+            draco_test_command: ./draco_tests
+
+          - test_name: ubuntu22-make-clang14-release-static
+            os: ubuntu-22.04
+            cmake_configure_command: |-
+              cmake .. -G "Unix Makefiles" \
+                -DBUILD_SHARED_LIBS=OFF \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_C_COMPILER=clang-14 \
+                -DCMAKE_CXX_COMPILER=clang++-14 \
+                -DDRACO_TESTS=ON
+            cmake_build_command: cmake --build . -- -j2
+            draco_test_command: ./draco_tests
+          - test_name: ubuntu22-make-clang14-release-static-with-transcoder
+            os: ubuntu-22.04
+            cmake_configure_command: |-
+              cmake .. -G "Unix Makefiles" \
+                -DBUILD_SHARED_LIBS=OFF \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_C_COMPILER=clang-14 \
+                -DCMAKE_CXX_COMPILER=clang++-14 \
                 -DDRACO_TESTS=ON \
                 -DDRACO_TRANSCODER_SUPPORTED=ON
             cmake_build_command: cmake --build . -- -j2
@@ -129,8 +153,8 @@ jobs:
               cmake .. -G "Unix Makefiles" \
                 -DBUILD_SHARED_LIBS=OFF \
                 -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_C_COMPILER=gcc-10 \
-                -DCMAKE_CXX_COMPILER=g++-10 \
+                -DCMAKE_C_COMPILER=gcc \
+                -DCMAKE_CXX_COMPILER=g++ \
                 -DDRACO_TESTS=ON
             cmake_build_command: cmake --build . -- -j2
             draco_test_command: ./draco_tests
@@ -140,8 +164,8 @@ jobs:
               cmake .. -G "Unix Makefiles" \
                 -DBUILD_SHARED_LIBS=OFF \
                 -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_C_COMPILER=gcc-10 \
-                -DCMAKE_CXX_COMPILER=g++-10 \
+                -DCMAKE_C_COMPILER=gcc \
+                -DCMAKE_CXX_COMPILER=g++ \
                 -DDRACO_TESTS=ON \
                 -DDRACO_TRANSCODER_SUPPORTED=ON
             cmake_build_command: cmake --build . -- -j2
@@ -165,7 +189,8 @@ jobs:
                 -DDRACO_TESTS=ON \
                 -DDRACO_TRANSCODER_SUPPORTED=ON
             cmake_build_command: cmake --build . --config Release -- -m:2
-            draco_test_command: Release/draco_tests
+            # TODO(https://github.com/google/draco/issues/938): Flaking on this target.
+            draco_test_command: Release/draco_tests --gtest_filter=-GltfDecoderTest.TestLoadUnsupportedTexCoordAttributes
 
           - test_name: windows-msvc-release-static
             os: windows-2019
@@ -185,7 +210,8 @@ jobs:
                 -DDRACO_TESTS=ON \
                 -DDRACO_TRANSCODER_SUPPORTED=ON
             cmake_build_command: cmake --build . --config Release -- -m:2
-            draco_test_command: Release/draco_tests
+            # TODO(https://github.com/google/draco/issues/938): Flaking on this target.
+            draco_test_command: Release/draco_tests --gtest_filter=-GltfDecoderTest.TestLoadUnsupportedTexCoordAttributes
 
           - test_name: windows-make-release-shared
             os: windows-2019
@@ -209,7 +235,8 @@ jobs:
                 -DDRACO_TESTS=ON \
                 -DDRACO_TRANSCODER_SUPPORTED=ON
             cmake_build_command: cmake --build . -- -j2
-            draco_test_command: ./draco_tests
+            # TODO(https://github.com/google/draco/issues/938): Flaking on this target.
+            draco_test_command: ./draco_tests --gtest_filter=-GltfDecoderTest.TestLoadUnsupportedTexCoordAttributes
 
           - test_name: windows-make-release-static
             os: windows-2019
@@ -233,7 +260,8 @@ jobs:
                 -DDRACO_TESTS=ON \
                 -DDRACO_TRANSCODER_SUPPORTED=ON
             cmake_build_command: cmake --build . -- -j2
-            draco_test_command: ./draco_tests
+            # TODO(https://github.com/google/draco/issues/938): Flaking on this target.
+            draco_test_command: ./draco_tests --gtest_filter=-GltfDecoderTest.TestLoadUnsupportedTexCoordAttributes
 
     name: test-${{ matrix.test_name }}
     runs-on: ${{ matrix.os }}