Skip to content

Commit

Permalink
fix ios to build two separate libraries (avoid lipo)
Browse files Browse the repository at this point in the history
also fix release process and apply ccache where possible
  • Loading branch information
jaromil committed Sep 24, 2024
1 parent cc22ed7 commit 8d5238f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 13 deletions.
29 changes: 21 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,25 +133,26 @@ jobs:
# make -f build/meson.mk CLANG=1 RELEASE=1

windows-build:
name: 🪟 Windows build
name: 🪟 Windows build test
needs: [reuse, c-lint, lua-lint]
if: "github.event_name == 'pull_request'"
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: hendrikmuhs/[email protected]
- name: install dependencies
run : |
sudo apt install -y zsh jq gcc-mingw-w64 g++-mingw-w64 ccache
sudo apt install -y zsh jq gcc-mingw-w64 g++-mingw-w64
- name: Build x86_64 windows .exe
run: |
make -f build/win-exe.mk CCACHE=1
make clean -C src
make -f build/win-dll.mk CCACHE=1
apple-ios-build:
name: 🍎 Apple iOS build
name: 🍎 Apple iOS build test
needs: [reuse, c-lint, lua-lint]
if: "github.event_name == 'pull_request'"
runs-on: macos-latest
Expand All @@ -161,9 +162,9 @@ jobs:
fetch-depth: 0
- run: |
make -f build/apple-ios.mk ios-arm64
make clean
make -f build/apple-ios.mk ios-sim
make -f build/apple-ios.mk ios-fat
# make clean
# make -f build/apple-ios.mk ios-sim
# make -f build/apple-ios.mk ios-fat
# make -f build/apple-ios.mk ios-armv7
# make clean
Expand Down Expand Up @@ -484,15 +485,27 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: hendrikmuhs/[email protected]
- run: |
make osx
- name: Upload artifact win x86_64
make clean
make -f build/apple-ios.mk ios-arm64 CCACHE=1
make clean
make -f build/apple-ios.mk ios-sim CCACHE=1
- name: Upload artifacts for Apple OSX
uses: actions/upload-artifact@v4
with:
name: release-bin-osx
name: release-apple-osx
path: |
src/zenroom.command
src/zencode-exec.command
- name: Upload artifacts for Apple iOS
uses: actions/upload-artifact@v4
with:
name: release-apple-ios
path: |
zenroom-ios-arm64.a
zenroom-ios-x86_64.a
npm-release:
name: 📦 npm release
Expand Down
10 changes: 5 additions & 5 deletions build/apple-ios.mk
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ ios-sim: ${BUILD_DEPS} ${ZEN_SOURCES}
TARGET=x86_64 libtool -static -o zenroom-ios-x86_64.a \
${ZEN_SOURCES} ${ldadd}

ios-fat:
lipo -create \
zenroom-ios-x86_64.a \
zenroom-ios-arm64.a \
-output zenroom-ios.a
# ios-fat:
# lipo -create \
# zenroom-ios-x86_64.a \
# zenroom-ios-arm64.a \
# -output zenroom-ios.a

include build/deps.mk

0 comments on commit 8d5238f

Please sign in to comment.