Skip to content

Commit

Permalink
Fix workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Kebekus committed Dec 6, 2023
1 parent de3016d commit 1ecb2c7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 29 deletions.
32 changes: 4 additions & 28 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,13 @@ jobs:
version: '6.5.2'
- name: Install software
run: |
brew install cmake ninja
- name: Configure and compile zlib
brew install ninja
- name: Compile and Install
run: |
$Qt6_DIR/bin/qt-cmake \
-G Ninja \
-S zlib \
-B build-zlib-ios \
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-DCMAKE_INSTALL_PREFIX=ios
cmake --build build-zlib-ios
cmake --install build-zlib-ios
cp -rv ios/* $Qt6_DIR
- name: Configure and compile libzip
run: |
$Qt6_DIR/bin/qt-cmake \
-G Ninja \
-S libzip \
-B build-libzip-ios \
-DBUILD_DOC=OFF \
-DBUILD_EXAMPLES=OFF \
-DBUILD_REGRESS=OFF \
-DBUILD_SHARED_LIBS=OFF \
-DBUILD_TOOLS=OFF \
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-DCMAKE_PREFIX_PATH=ios \
-DCMAKE_INSTALL_PREFIX=ios
cmake --build build-libzip-ios
cmake --install build-libzip-ios
Qt6_DIR_BASE=$(dirname "$Qt6_DIR") ./buildscript-ios.sh
- name: Package
run: |
tar cvfz enrouteDependencies_ios.tar.gz ios
tar cvfz enrouteDependencies_ios.tar.gz Qt
- name: Upload to developerBuilds
run: |
gh release upload --clobber developerBuilds *.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Compile on Linux

on:
push:
branches: [ feature/actions ]
branches: [ main ]

jobs:
build:
Expand Down

0 comments on commit 1ecb2c7

Please sign in to comment.