Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Assorted dependency updates #52

Merged
merged 4 commits into from
Mar 24, 2024
Merged

Assorted dependency updates #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b60d285
Assorted dependency updates
AlexTMjugador Mar 22, 2024
e82255a
Possible Windows CI fix
AlexTMjugador Mar 22, 2024
99cea73
Bump `upload-artifact` action vers tag to get rid of deprecation warns
AlexTMjugador Mar 22, 2024
c33d823
More Windows CI fixes
AlexTMjugador Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ concurrency:

jobs:
build-windows:
runs-on: windows-2019
runs-on: windows-2022
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
Expand Down Expand Up @@ -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/*
Expand All @@ -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
Expand Down Expand Up @@ -192,25 +192,20 @@ 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/*

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
Expand Down Expand Up @@ -292,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/*
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")

Expand Down
10 changes: 5 additions & 5 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down