Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support
This commit is contained in:
commit
911e65af55
2 changed files with 22 additions and 0 deletions
19
.github/workflows/deploy.yml
vendored
19
.github/workflows/deploy.yml
vendored
|
@ -1,5 +1,6 @@
|
|||
name: 'Deploy workflow'
|
||||
|
||||
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
|
@ -169,6 +170,24 @@ jobs:
|
|||
mkdir build-ios
|
||||
$QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR
|
||||
|
||||
- name: iOS Build/Release With Multiple Targets Action
|
||||
uses: kumarsunil0007/build-ios-action@latest
|
||||
with:
|
||||
project-path: build-ios/AmneziaVPN.xcodeproj
|
||||
p12-base64: ~/amnezia-vpn/amnezia-ios-certificates/certs/distribution/443886Q5PL.p12
|
||||
mobileprovision-base64: ~/amnezia-vpn/amnezia-ios-certificates/testprofilez.mobileprovision
|
||||
code-signing-identity: 'iOS Distribution'
|
||||
team-id: 'X7UJ388FXK'
|
||||
configuration: Release
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# ------------------------------------------------------
|
||||
|
||||
Build-MacOS:
|
||||
|
|
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -31,3 +31,6 @@
|
|||
[submodule "client/3rd/zlib"]
|
||||
path = client/3rd/zlib
|
||||
url = https://github.com/madler/zlib.git
|
||||
[submodule "deploy/amnezia-ios-certificates"]
|
||||
path = deploy/amnezia-ios-certificates
|
||||
url = https://github.com/amnezia-vpn/amnezia-ios-certificates.git
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue