From b60d28572c626ea0181e654a2448b859cbb49503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= Date: Fri, 22 Mar 2024 22:57:01 +0100 Subject: [PATCH 1/4] Assorted dependency updates These updates fix building the project on my up to date Linux box due to missing cstdint headers on the older Draco versions it was pinned to, and bumps Conan 1.x to the latest semver-compatible release, which also introduces support for newer GCC compilers. While at it, I've also bumped the GitHub Actions checkout version tag to v4, from v3, and the runner image versions. The Ubuntu runner version was purposefully not updated to avoid the risk of making binaries less portable than before due to a bump in the `glibc` version that the compiler will link to. --- .github/workflows/build.yaml | 19 +++++++------------ CMakeLists.txt | 2 +- conanfile.py | 10 +++++----- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ad2efff..56ad3f5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,14 +15,14 @@ concurrency: jobs: build-windows: - runs-on: windows-2019 + runs-on: windows-2022 steps: - name: Checkout uses: actions/checkout@v3 - name: Install conan run: | - pip install --upgrade conan==1.58 + pip install --upgrade conan==1.63.0 shell: bash - name: Setup conan profile @@ -111,11 +111,11 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install conan run: | - pip install --upgrade conan==1.58 + pip install --upgrade conan==1.63.0 shell: bash - name: Setup conan profile @@ -198,19 +198,14 @@ jobs: path: FBX2glTF-linux-x86_64/* build-macos: - runs-on: macos-11 + runs-on: macos-13 steps: - name: Checkout - uses: actions/checkout@v3 - - - name: Update python - uses: actions/setup-python@v4 - with: - python-version: "3.11" + uses: actions/checkout@v4 - name: Install conan run: | - pip install --upgrade conan==1.58 + pip install --upgrade conan==1.63.0 shell: bash - name: Setup conan profile diff --git a/CMakeLists.txt b/CMakeLists.txt index 6051d39..ba50950 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # DRACO ExternalProject_Add(Draco GIT_REPOSITORY https://github.com/google/draco - GIT_TAG 75b82f7b68c797b4e0ff5e73ca8a81e2db3db797 + GIT_TAG 8786740086a9f4d83f44aa83badfbea4dce7a1b5 PREFIX draco INSTALL_DIR CMAKE_ARGS diff --git a/conanfile.py b/conanfile.py index 3e94af3..9d0a8c4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -9,11 +9,11 @@ class FBX2glTFConan(ConanFile): settings = "os", "compiler", "build_type", "arch" requires = ( - ("boost/1.78.0"), - ("libiconv/1.15"), - ("zlib/1.2.11"), - ("libxml2/2.9.12"), - ("fmt/5.3.0"), + "boost/1.84.0", + "libiconv/1.17", + "zlib/1.3.1", + "libxml2/2.12.5", + "fmt/5.3.0", ) generators = "cmake_find_package", "cmake_paths" From e82255acae4444dff895224501be02495141b194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= Date: Sat, 23 Mar 2024 00:01:04 +0100 Subject: [PATCH 2/4] Possible Windows CI fix --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 56ad3f5..48c32a7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,10 +15,10 @@ concurrency: jobs: build-windows: - runs-on: windows-2022 + runs-on: windows-2019 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install conan run: | From 99cea73695914a747014a79504912c7b179e228f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= Date: Sat, 23 Mar 2024 00:02:52 +0100 Subject: [PATCH 3/4] Bump `upload-artifact` action vers tag to get rid of deprecation warns --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 48c32a7..70679b4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -102,7 +102,7 @@ jobs: FBX2glTF-windows-x86_64/FBX-SDK-License.rtf - name: FBX2glTF-windows-x86_64 - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: FBX2glTF-windows-x86_64 path: FBX2glTF-windows-x86_64/* @@ -192,7 +192,7 @@ jobs: files: FBX2glTF-linux-x86_64.zip - name: FBX2glTF-linux-x86_64 - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: FBX2glTF-linux-x86_64 path: FBX2glTF-linux-x86_64/* @@ -287,7 +287,7 @@ jobs: files: FBX2glTF-macos-x86_64.zip - name: FBX2glTF-macos-x86_64 - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: FBX2glTF-macos-x86_64 path: FBX2glTF-macos-x86_64/* From c33d823373bfcee7fd6bd95b5937b21969276d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= Date: Sat, 23 Mar 2024 11:58:50 +0100 Subject: [PATCH 4/4] More Windows CI fixes --- .github/workflows/build.yaml | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 70679b4..8d3acb1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,7 +15,7 @@ concurrency: jobs: build-windows: - runs-on: windows-2019 + runs-on: windows-2022 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/CMakeLists.txt b/CMakeLists.txt index ba50950..e24b390 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,7 +181,7 @@ set(LIB_SOURCE_FILES ) add_library(libFBX2glTF STATIC ${LIB_SOURCE_FILES}) -set_target_properties(libFBX2glTF PROPERTIES OUTPUT_NAME "FBX2glTF") +set_target_properties(libFBX2glTF PROPERTIES OUTPUT_NAME "libFBX2glTF") add_executable(FBX2glTF src/FBX2glTF.cpp) set_target_properties(FBX2glTF PROPERTIES OUTPUT_NAME "FBX2glTF")