Skip to content

Commit

Permalink
Fix file to be uploaded. (#40)
Browse files Browse the repository at this point in the history
* Fix library naming regarding arch.

* Fix typo in macos build.

* Upload only IREE.gd library.
  • Loading branch information
RechieKho authored Jan 6, 2024
1 parent 4fad079 commit 63f38b2
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,5 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: "libiree-gd.${{ matrix.target }}.${{ matrix.build_type }}.${{ matrix.arch }}.${{ matrix.lib_suffix }}"
path: "${{ github.workspace }}/build/lib/*"
path: "${{ github.workspace }}/build/lib/libiree-gd*"
if-no-files-found: error
2 changes: 1 addition & 1 deletion .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: "libiree-gd.${{ matrix.target }}.${{ matrix.build_type }}.${{ matrix.arch }}.${{ matrix.lib_suffix }}"
path: "${{ github.workspace }}/build/lib/*"
path: "${{ github.workspace }}/build/lib/libiree-gd*"
if-no-files-found: error
2 changes: 1 addition & 1 deletion .github/workflows/build_linux_arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,5 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: "libiree-gd.${{ matrix.target }}.${{ matrix.build_type }}.${{ matrix.arch }}.${{ matrix.lib_suffix }}"
path: "${{ github.workspace }}/build/lib/*"
path: "${{ github.workspace }}/build/lib/libiree-gd*"
if-no-files-found: error
4 changes: 2 additions & 2 deletions .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
fi
cd "${{ github.workspace }}/build"
cmake "${{ github.workspace }}" -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type_keyword }} \
-CMAKE_OSX_ARCHITECTURES="${{ matrix.cmake_arch_keyword }}"
-DCMAKE_OSX_ARCHITECTURES="${{ matrix.cmake_arch_keyword }}"
- name: Build project
shell: bash
Expand All @@ -65,5 +65,5 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: "libiree-gd.${{ matrix.target }}.${{ matrix.build_type }}.${{ matrix.arch }}.${{ matrix.lib_suffix }}"
path: "${{ github.workspace }}/build/lib/*"
path: "${{ github.workspace }}/build/lib/libiree-gd*"
if-no-files-found: error
2 changes: 1 addition & 1 deletion .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: "libiree-gd.${{ matrix.target }}.${{ matrix.build_type }}.${{ matrix.arch }}.${{ matrix.lib_suffix }}"
path: "${{ github.workspace }}\\build\\lib\\*"
path: "${{ github.workspace }}\\build\\lib\\libiree-gd*"
if-no-files-found: error
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,11 @@ endif()
string(TOLOWER ${CMAKE_SYSTEM_NAME} SYSTEM_NAME)
string(TOLOWER ${GODOT_CPP_BUILD_TYPE} BUILD_TYPE)

if(ANDROID)
# Added the android abi after system name
set(SYSTEM_NAME ${SYSTEM_NAME}.${ANDROID_ABI})
string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} ARCH)
if("${ARCH}" MATCHES aarch64)
set(ARCH arm64)
elseif("${ARCH}" MATCHES amd64)
set(ARCH x86_64)
endif()

#-------------------------------------------------------------------------------
Expand All @@ -163,7 +165,6 @@ add_subdirectory(${3RD_PARTY_DIR}/godot-cpp)
#-------------------------------------------------------------------------------
# `iree.gd` library
#-------------------------------------------------------------------------------
set(ARCH ${CMAKE_SYSTEM_PROCESSOR})

set(LIB_NAME ${PROJECT_NAME}.${SYSTEM_NAME}.${BUILD_TYPE}.${ARCH})
file(GLOB_RECURSE SRCS ${SRC_DIR}/*.c**)
Expand Down

0 comments on commit 63f38b2

Please sign in to comment.