error: No profiles for NE
This commit is contained in:
Macbook
Yaroslav Yashin
parent
f3a058ba55
commit
31c672dab8
2 changed files with 376 additions and 385 deletions
745
.github/workflows/deploy.yml
vendored
745
.github/workflows/deploy.yml
vendored
|
|
@ -9,228 +9,215 @@ env:
|
||||||
QT_MIRROR: https://mirrors.ocf.berkeley.edu/qt/ # https://download.qt.io/static/mirrorlist/
|
QT_MIRROR: https://mirrors.ocf.berkeley.edu/qt/ # https://download.qt.io/static/mirrorlist/
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Build-Linux-Ubuntu:
|
# Build-Linux-Ubuntu:
|
||||||
runs-on: ubuntu-20.04
|
# runs-on: ubuntu-20.04
|
||||||
|
|
||||||
env:
|
# env:
|
||||||
QT_VERSION: 6.6.2
|
# QT_VERSION: 6.6.2
|
||||||
QIF_VERSION: 4.7
|
# QIF_VERSION: 4.7
|
||||||
PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
|
# PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
|
||||||
PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
|
# DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
|
||||||
DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
|
|
||||||
DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
|
|
||||||
DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
|
|
||||||
|
|
||||||
steps:
|
# steps:
|
||||||
- name: 'Install Qt'
|
# - name: 'Install Qt'
|
||||||
uses: jurplel/install-qt-action@v3
|
# uses: jurplel/install-qt-action@v3
|
||||||
with:
|
# with:
|
||||||
version: ${{ env.QT_VERSION }}
|
# version: ${{ env.QT_VERSION }}
|
||||||
host: 'linux'
|
# host: 'linux'
|
||||||
target: 'desktop'
|
# target: 'desktop'
|
||||||
arch: 'gcc_64'
|
# arch: 'gcc_64'
|
||||||
modules: 'qtremoteobjects qt5compat qtshadertools'
|
# modules: 'qtremoteobjects qt5compat qtshadertools'
|
||||||
dir: ${{ runner.temp }}
|
# dir: ${{ runner.temp }}
|
||||||
setup-python: 'true'
|
# setup-python: 'true'
|
||||||
tools: 'tools_ifw'
|
# tools: 'tools_ifw'
|
||||||
set-env: 'true'
|
# set-env: 'true'
|
||||||
extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
# extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
||||||
|
|
||||||
- name: 'Get sources'
|
# - name: 'Get sources'
|
||||||
uses: actions/checkout@v4
|
# uses: actions/checkout@v4
|
||||||
with:
|
# with:
|
||||||
submodules: 'true'
|
# submodules: 'true'
|
||||||
fetch-depth: 10
|
# fetch-depth: 10
|
||||||
|
|
||||||
- name: 'Setup ccache'
|
# - name: 'Setup ccache'
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
# uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
|
||||||
- name: 'Build project'
|
# - name: 'Build project'
|
||||||
run: |
|
# run: |
|
||||||
sudo apt-get install libxkbcommon-x11-0
|
# sudo apt-get install libxkbcommon-x11-0
|
||||||
export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin
|
# export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin
|
||||||
export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin
|
# export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin
|
||||||
bash deploy/build_linux.sh
|
# bash deploy/build_linux.sh
|
||||||
|
|
||||||
- name: 'Pack installer'
|
# - name: 'Pack installer'
|
||||||
run: cd deploy && tar -cf AmneziaVPN_Linux_Installer.tar AmneziaVPN_Linux_Installer.bin
|
# run: cd deploy && tar -cf AmneziaVPN_Linux_Installer.tar AmneziaVPN_Linux_Installer.bin
|
||||||
|
|
||||||
- name: 'Upload installer artifact'
|
# - name: 'Upload installer artifact'
|
||||||
uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
with:
|
# with:
|
||||||
name: AmneziaVPN_Linux_installer.tar
|
# name: AmneziaVPN_Linux_installer.tar
|
||||||
path: deploy/AmneziaVPN_Linux_Installer.tar
|
# path: deploy/AmneziaVPN_Linux_Installer.tar
|
||||||
retention-days: 7
|
# retention-days: 7
|
||||||
|
|
||||||
- name: 'Upload unpacked artifact'
|
# - name: 'Upload unpacked artifact'
|
||||||
uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
with:
|
# with:
|
||||||
name: AmneziaVPN_Linux_unpacked
|
# name: AmneziaVPN_Linux_unpacked
|
||||||
path: deploy/AppDir
|
# path: deploy/AppDir
|
||||||
retention-days: 7
|
# retention-days: 7
|
||||||
|
|
||||||
- name: 'Upload translations artifact'
|
# - name: 'Upload translations artifact'
|
||||||
uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
with:
|
# with:
|
||||||
name: AmneziaVPN_translations
|
# name: AmneziaVPN_translations
|
||||||
path: client/translations
|
# path: client/translations
|
||||||
retention-days: 7
|
# retention-days: 7
|
||||||
|
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
|
|
||||||
Build-Windows:
|
# Build-Windows:
|
||||||
runs-on: windows-latest
|
# runs-on: windows-latest
|
||||||
|
|
||||||
env:
|
# env:
|
||||||
QT_VERSION: 6.6.2
|
# QT_VERSION: 6.6.2
|
||||||
QIF_VERSION: 4.7
|
# QIF_VERSION: 4.7
|
||||||
BUILD_ARCH: 64
|
# BUILD_ARCH: 64
|
||||||
PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
|
# PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
|
||||||
PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
|
# DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
|
||||||
DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
|
|
||||||
DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
|
|
||||||
DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
|
|
||||||
|
|
||||||
steps:
|
# steps:
|
||||||
- name: 'Get sources'
|
# - name: 'Get sources'
|
||||||
uses: actions/checkout@v4
|
# uses: actions/checkout@v4
|
||||||
with:
|
# with:
|
||||||
submodules: 'true'
|
# submodules: 'true'
|
||||||
fetch-depth: 10
|
# fetch-depth: 10
|
||||||
|
|
||||||
- name: 'Setup ccache'
|
# - name: 'Setup ccache'
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
# uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
|
||||||
- name: 'Install Qt'
|
# - name: 'Install Qt'
|
||||||
uses: jurplel/install-qt-action@v3
|
# uses: jurplel/install-qt-action@v3
|
||||||
with:
|
# with:
|
||||||
version: ${{ env.QT_VERSION }}
|
# version: ${{ env.QT_VERSION }}
|
||||||
host: 'windows'
|
# host: 'windows'
|
||||||
target: 'desktop'
|
# target: 'desktop'
|
||||||
arch: 'win64_msvc2019_64'
|
# arch: 'win64_msvc2019_64'
|
||||||
modules: 'qtremoteobjects qt5compat qtshadertools'
|
# modules: 'qtremoteobjects qt5compat qtshadertools'
|
||||||
dir: ${{ runner.temp }}
|
# dir: ${{ runner.temp }}
|
||||||
setup-python: 'true'
|
# setup-python: 'true'
|
||||||
tools: 'tools_ifw'
|
# tools: 'tools_ifw'
|
||||||
set-env: 'true'
|
# set-env: 'true'
|
||||||
extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
# extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
||||||
|
|
||||||
- name: 'Setup mvsc'
|
# - name: 'Setup mvsc'
|
||||||
uses: ilammy/msvc-dev-cmd@v1
|
# uses: ilammy/msvc-dev-cmd@v1
|
||||||
with:
|
# with:
|
||||||
arch: 'x64'
|
# arch: 'x64'
|
||||||
|
|
||||||
- name: 'Build project'
|
# - name: 'Build project'
|
||||||
shell: cmd
|
# shell: cmd
|
||||||
run: |
|
# run: |
|
||||||
set BUILD_ARCH=${{ env.BUILD_ARCH }}
|
# set BUILD_ARCH=${{ env.BUILD_ARCH }}
|
||||||
set QT_BIN_DIR="${{ runner.temp }}\\Qt\\${{ env.QT_VERSION }}\\msvc2019_64\\bin"
|
# set QT_BIN_DIR="${{ runner.temp }}\\Qt\\${{ env.QT_VERSION }}\\msvc2019_64\\bin"
|
||||||
set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin"
|
# set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin"
|
||||||
call deploy\\build_windows.bat
|
# call deploy\\build_windows.bat
|
||||||
|
|
||||||
- name: 'Upload installer artifact'
|
# - name: 'Upload installer artifact'
|
||||||
uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
with:
|
# with:
|
||||||
name: AmneziaVPN_Windows_installer
|
# name: AmneziaVPN_Windows_installer
|
||||||
path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe
|
# path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe
|
||||||
retention-days: 7
|
# retention-days: 7
|
||||||
|
|
||||||
- name: 'Upload unpacked artifact'
|
# - name: 'Upload unpacked artifact'
|
||||||
uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
with:
|
# with:
|
||||||
name: AmneziaVPN_Windows_unpacked
|
# name: AmneziaVPN_Windows_unpacked
|
||||||
path: deploy\\build_${{ env.BUILD_ARCH }}\\client\\Release
|
# path: deploy\\build_${{ env.BUILD_ARCH }}\\client\\Release
|
||||||
retention-days: 7
|
# retention-days: 7
|
||||||
|
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
|
|
||||||
Build-iOS:
|
# Build-iOS:
|
||||||
runs-on: macos-13
|
# runs-on: macos-13
|
||||||
|
|
||||||
env:
|
# env:
|
||||||
QT_VERSION: 6.6.2
|
# QT_VERSION: 6.6.2
|
||||||
CC: cc
|
# CC: cc
|
||||||
CXX: c++
|
# CXX: c++
|
||||||
PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
|
# PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
|
||||||
PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
|
# DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
|
||||||
DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
|
|
||||||
DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
|
|
||||||
DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
|
|
||||||
|
|
||||||
steps:
|
# steps:
|
||||||
- name: 'Setup xcode'
|
# - name: 'Setup xcode'
|
||||||
uses: maxim-lobanov/setup-xcode@v1
|
# uses: maxim-lobanov/setup-xcode@v1
|
||||||
with:
|
# with:
|
||||||
xcode-version: '15.2'
|
# xcode-version: '15.2'
|
||||||
|
|
||||||
- name: 'Install desktop Qt'
|
# - name: 'Install desktop Qt'
|
||||||
uses: jurplel/install-qt-action@v3
|
# uses: jurplel/install-qt-action@v3
|
||||||
with:
|
# with:
|
||||||
version: ${{ env.QT_VERSION }}
|
# version: ${{ env.QT_VERSION }}
|
||||||
host: 'mac'
|
# host: 'mac'
|
||||||
target: 'desktop'
|
# target: 'desktop'
|
||||||
modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
|
# modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
|
||||||
arch: 'clang_64'
|
# arch: 'clang_64'
|
||||||
dir: ${{ runner.temp }}
|
# dir: ${{ runner.temp }}
|
||||||
set-env: 'true'
|
# set-env: 'true'
|
||||||
extra: '--base ${{ env.QT_MIRROR }}'
|
# extra: '--base ${{ env.QT_MIRROR }}'
|
||||||
|
|
||||||
- name: 'Install iOS Qt'
|
# - name: 'Install iOS Qt'
|
||||||
uses: jurplel/install-qt-action@v3
|
# uses: jurplel/install-qt-action@v3
|
||||||
with:
|
# with:
|
||||||
version: ${{ env.QT_VERSION }}
|
# version: ${{ env.QT_VERSION }}
|
||||||
host: 'mac'
|
# host: 'mac'
|
||||||
target: 'ios'
|
# target: 'ios'
|
||||||
modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
|
# modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
|
||||||
dir: ${{ runner.temp }}
|
# dir: ${{ runner.temp }}
|
||||||
setup-python: 'true'
|
# setup-python: 'true'
|
||||||
set-env: 'true'
|
# set-env: 'true'
|
||||||
extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
# extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
||||||
|
|
||||||
- name: 'Install go'
|
# - name: 'Install go'
|
||||||
uses: actions/setup-go@v5
|
# uses: actions/setup-go@v5
|
||||||
with:
|
# with:
|
||||||
go-version: '1.22.1'
|
# go-version: '1.22.1'
|
||||||
cache: false
|
# cache: false
|
||||||
|
|
||||||
- name: 'Setup gomobile'
|
# - name: 'Setup gomobile'
|
||||||
run: |
|
# run: |
|
||||||
export PATH=$PATH:~/go/bin
|
# export PATH=$PATH:~/go/bin
|
||||||
go install golang.org/x/mobile/cmd/gomobile@latest
|
# go install golang.org/x/mobile/cmd/gomobile@latest
|
||||||
gomobile init
|
# gomobile init
|
||||||
|
|
||||||
- name: 'Get sources'
|
# - name: 'Get sources'
|
||||||
uses: actions/checkout@v4
|
# uses: actions/checkout@v4
|
||||||
with:
|
# with:
|
||||||
submodules: 'true'
|
# submodules: 'true'
|
||||||
fetch-depth: 10
|
# fetch-depth: 10
|
||||||
|
|
||||||
- name: 'Setup ccache'
|
# - name: 'Setup ccache'
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
# uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
|
||||||
- name: 'Install dependencies'
|
# - name: 'Install dependencies'
|
||||||
run: pip install jsonschema jinja2
|
# run: pip install jsonschema jinja2
|
||||||
|
|
||||||
- name: 'Build project'
|
# - name: 'Build project'
|
||||||
run: |
|
# run: |
|
||||||
git submodule update --init --recursive
|
# git submodule update --init --recursive
|
||||||
export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin"
|
# export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin"
|
||||||
export QT_MACOS_ROOT_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos"
|
# export QT_MACOS_ROOT_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos"
|
||||||
export PATH=$PATH:~/go/bin
|
# export PATH=$PATH:~/go/bin
|
||||||
sh deploy/build_ios.sh | \
|
# sh deploy/build_ios.sh
|
||||||
sed -e '/-Xcc -DPROD_AGW_PUBLIC_KEY/,/-Xcc/ { /-Xcc/!d; }' -e '/-Xcc -DPROD_AGW_PUBLIC_KEY/d' | \
|
# env:
|
||||||
sed -e '/-Xcc -DDEV_AGW_PUBLIC_KEY/,/-Xcc/ { /-Xcc/!d; }' -e '/-Xcc -DDEV_AGW_PUBLIC_KEY/d' | \
|
# IOS_TRUST_CERT_BASE64: ${{ secrets.IOS_TRUST_CERT_BASE64 }}
|
||||||
sed -e '/-DPROD_AGW_PUBLIC_KEY/,/-D/ { /-D/!d; }' -e '/-DPROD_AGW_PUBLIC_KEY/d' | \
|
# IOS_SIGNING_CERT_BASE64: ${{ secrets.IOS_SIGNING_CERT_BASE64 }}
|
||||||
sed -e '/-DDEV_AGW_PUBLIC_KEY/,/-D/ { /-D/!d; }' -e '/-DDEV_AGW_PUBLIC_KEY/d'
|
# IOS_SIGNING_CERT_PASSWORD: ${{ secrets.IOS_SIGNING_CERT_PASSWORD }}
|
||||||
env:
|
# APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }}
|
||||||
IOS_TRUST_CERT_BASE64: ${{ secrets.IOS_TRUST_CERT_BASE64 }}
|
# APPSTORE_CONNECT_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }}
|
||||||
IOS_SIGNING_CERT_BASE64: ${{ secrets.IOS_SIGNING_CERT_BASE64 }}
|
# APPSTORE_CONNECT_PRIVATE_KEY: ${{ secrets.APPSTORE_CONNECT_PRIVATE_KEY }}
|
||||||
IOS_SIGNING_CERT_PASSWORD: ${{ secrets.IOS_SIGNING_CERT_PASSWORD }}
|
# IOS_APP_PROVISIONING_PROFILE: ${{ secrets.IOS_APP_PROVISIONING_PROFILE }}
|
||||||
APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }}
|
# IOS_NE_PROVISIONING_PROFILE: ${{ secrets.IOS_NE_PROVISIONING_PROFILE }}
|
||||||
APPSTORE_CONNECT_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }}
|
|
||||||
APPSTORE_CONNECT_PRIVATE_KEY: ${{ secrets.APPSTORE_CONNECT_PRIVATE_KEY }}
|
|
||||||
IOS_APP_PROVISIONING_PROFILE: ${{ secrets.IOS_APP_PROVISIONING_PROFILE }}
|
|
||||||
IOS_NE_PROVISIONING_PROFILE: ${{ secrets.IOS_NE_PROVISIONING_PROFILE }}
|
|
||||||
|
|
||||||
# - name: 'Upload appstore .ipa and dSYMs to artifacts'
|
# - name: 'Upload appstore .ipa and dSYMs to artifacts'
|
||||||
# uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
|
|
@ -243,72 +230,70 @@ jobs:
|
||||||
|
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
|
|
||||||
Build-MacOS:
|
# Build-MacOS:
|
||||||
runs-on: macos-latest
|
# runs-on: macos-latest
|
||||||
|
|
||||||
env:
|
# env:
|
||||||
# Keep compat with MacOS 10.15 aka Catalina by Qt 6.4
|
# # Keep compat with MacOS 10.15 aka Catalina by Qt 6.4
|
||||||
QT_VERSION: 6.4.3
|
# QT_VERSION: 6.4.3
|
||||||
QIF_VERSION: 4.6
|
# QIF_VERSION: 4.6
|
||||||
PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
|
# PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
|
||||||
PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
|
# DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
|
||||||
DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
|
|
||||||
DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
|
|
||||||
DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
|
|
||||||
|
|
||||||
steps:
|
# steps:
|
||||||
- name: 'Setup xcode'
|
# - name: 'Setup xcode'
|
||||||
uses: maxim-lobanov/setup-xcode@v1
|
# uses: maxim-lobanov/setup-xcode@v1
|
||||||
with:
|
# with:
|
||||||
xcode-version: '15.4.0'
|
# xcode-version: '14.3.1'
|
||||||
|
|
||||||
- name: 'Install Qt'
|
# - name: 'Install Qt'
|
||||||
uses: jurplel/install-qt-action@v3
|
# uses: jurplel/install-qt-action@v3
|
||||||
with:
|
# with:
|
||||||
version: ${{ env.QT_VERSION }}
|
# version: ${{ env.QT_VERSION }}
|
||||||
host: 'mac'
|
# host: 'mac'
|
||||||
target: 'desktop'
|
# target: 'desktop'
|
||||||
arch: 'clang_64'
|
# arch: 'clang_64'
|
||||||
modules: 'qtremoteobjects qt5compat qtshadertools'
|
# modules: 'qtremoteobjects qt5compat qtshadertools'
|
||||||
dir: ${{ runner.temp }}
|
# dir: ${{ runner.temp }}
|
||||||
setup-python: 'true'
|
# setup-python: 'true'
|
||||||
set-env: 'true'
|
# set-env: 'true'
|
||||||
extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
# extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
||||||
|
|
||||||
- name: 'Install Qt Installer Framework ${{ env.QIF_VERSION }}'
|
# - name: 'Install Qt Installer Framework ${{ env.QIF_VERSION }}'
|
||||||
run: |
|
# run: |
|
||||||
mkdir -pv ${{ runner.temp }}/Qt/Tools/QtInstallerFramework
|
# mkdir -pv ${{ runner.temp }}/Qt/Tools/QtInstallerFramework
|
||||||
wget https://qt.amzsvc.com/tools/ifw/${{ env.QIF_VERSION }}.zip
|
# wget https://qt.amzsvc.com/tools/ifw/${{ env.QIF_VERSION }}.zip
|
||||||
unzip ${{ env.QIF_VERSION }}.zip -d ${{ runner.temp }}/Qt/Tools/QtInstallerFramework/
|
# unzip ${{ env.QIF_VERSION }}.zip -d ${{ runner.temp }}/Qt/Tools/QtInstallerFramework/
|
||||||
|
|
||||||
- name: 'Get sources'
|
# - name: 'Get sources'
|
||||||
uses: actions/checkout@v4
|
# uses: actions/checkout@v4
|
||||||
with:
|
# with:
|
||||||
submodules: 'true'
|
# submodules: 'true'
|
||||||
fetch-depth: 10
|
# fetch-depth: 10
|
||||||
|
|
||||||
- name: 'Setup ccache'
|
# - name: 'Setup ccache'
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
# uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
|
||||||
- name: 'Build project'
|
# - name: 'Build project'
|
||||||
run: |
|
# run: |
|
||||||
export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos/bin"
|
# export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos/bin"
|
||||||
export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin"
|
# export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin"
|
||||||
bash deploy/build_macos.sh
|
# bash deploy/build_macos.sh
|
||||||
|
|
||||||
- name: 'Upload installer artifact'
|
# - name: 'Upload installer artifact'
|
||||||
uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
with:
|
# with:
|
||||||
name: AmneziaVPN_MacOS_installer
|
# name: AmneziaVPN_MacOS_installer
|
||||||
path: AmneziaVPN.dmg
|
# path: AmneziaVPN.dmg
|
||||||
retention-days: 7
|
# retention-days: 7
|
||||||
|
|
||||||
|
# - name: 'Upload unpacked artifact'
|
||||||
|
# uses: actions/upload-artifact@v4
|
||||||
|
# with:
|
||||||
|
# name: AmneziaVPN_MacOS_unpacked
|
||||||
|
# path: deploy/build/client/AmneziaVPN.app
|
||||||
|
# retention-days: 7
|
||||||
|
|
||||||
- name: 'Upload unpacked artifact'
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: AmneziaVPN_MacOS_unpacked
|
|
||||||
path: deploy/build/client/AmneziaVPN.app
|
|
||||||
retention-days: 7
|
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
Build-MacOS-NE:
|
Build-MacOS-NE:
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
|
|
@ -375,162 +360,154 @@ jobs:
|
||||||
|
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
|
|
||||||
Build-Android:
|
# Build-Android:
|
||||||
runs-on: ubuntu-latest
|
# runs-on: ubuntu-latest
|
||||||
|
|
||||||
env:
|
# env:
|
||||||
ANDROID_BUILD_PLATFORM: android-34
|
# ANDROID_BUILD_PLATFORM: android-34
|
||||||
QT_VERSION: 6.7.3
|
# QT_VERSION: 6.7.2
|
||||||
QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
|
# QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
|
||||||
PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
|
# PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
|
||||||
PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
|
# DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
|
||||||
DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
|
|
||||||
DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
|
|
||||||
DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
|
|
||||||
|
|
||||||
steps:
|
# steps:
|
||||||
- name: 'Install desktop Qt'
|
# - name: 'Install desktop Qt'
|
||||||
uses: jurplel/install-qt-action@v4
|
# uses: jurplel/install-qt-action@v4
|
||||||
with:
|
# with:
|
||||||
version: ${{ env.QT_VERSION }}
|
# version: ${{ env.QT_VERSION }}
|
||||||
host: 'linux'
|
# host: 'linux'
|
||||||
target: 'desktop'
|
# target: 'desktop'
|
||||||
arch: 'linux_gcc_64'
|
# arch: 'linux_gcc_64'
|
||||||
modules: ${{ env.QT_MODULES }}
|
# modules: ${{ env.QT_MODULES }}
|
||||||
dir: ${{ runner.temp }}
|
# dir: ${{ runner.temp }}
|
||||||
py7zrversion: '==0.22.*'
|
# extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
||||||
extra: '--base ${{ env.QT_MIRROR }}'
|
|
||||||
|
|
||||||
- name: 'Install android_x86_64 Qt'
|
# - name: 'Install android_x86_64 Qt'
|
||||||
uses: jurplel/install-qt-action@v4
|
# uses: jurplel/install-qt-action@v4
|
||||||
with:
|
# with:
|
||||||
version: ${{ env.QT_VERSION }}
|
# version: ${{ env.QT_VERSION }}
|
||||||
host: 'linux'
|
# host: 'linux'
|
||||||
target: 'android'
|
# target: 'android'
|
||||||
arch: 'android_x86_64'
|
# arch: 'android_x86_64'
|
||||||
modules: ${{ env.QT_MODULES }}
|
# modules: ${{ env.QT_MODULES }}
|
||||||
dir: ${{ runner.temp }}
|
# dir: ${{ runner.temp }}
|
||||||
py7zrversion: '==0.22.*'
|
# extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
||||||
extra: '--base ${{ env.QT_MIRROR }}'
|
|
||||||
|
|
||||||
- name: 'Install android_x86 Qt'
|
# - name: 'Install android_x86 Qt'
|
||||||
uses: jurplel/install-qt-action@v4
|
# uses: jurplel/install-qt-action@v4
|
||||||
with:
|
# with:
|
||||||
version: ${{ env.QT_VERSION }}
|
# version: ${{ env.QT_VERSION }}
|
||||||
host: 'linux'
|
# host: 'linux'
|
||||||
target: 'android'
|
# target: 'android'
|
||||||
arch: 'android_x86'
|
# arch: 'android_x86'
|
||||||
modules: ${{ env.QT_MODULES }}
|
# modules: ${{ env.QT_MODULES }}
|
||||||
dir: ${{ runner.temp }}
|
# dir: ${{ runner.temp }}
|
||||||
py7zrversion: '==0.22.*'
|
# extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
||||||
extra: '--base ${{ env.QT_MIRROR }}'
|
|
||||||
|
|
||||||
- name: 'Install android_armv7 Qt'
|
# - name: 'Install android_armv7 Qt'
|
||||||
uses: jurplel/install-qt-action@v4
|
# uses: jurplel/install-qt-action@v4
|
||||||
with:
|
# with:
|
||||||
version: ${{ env.QT_VERSION }}
|
# version: ${{ env.QT_VERSION }}
|
||||||
host: 'linux'
|
# host: 'linux'
|
||||||
target: 'android'
|
# target: 'android'
|
||||||
arch: 'android_armv7'
|
# arch: 'android_armv7'
|
||||||
modules: ${{ env.QT_MODULES }}
|
# modules: ${{ env.QT_MODULES }}
|
||||||
dir: ${{ runner.temp }}
|
# dir: ${{ runner.temp }}
|
||||||
py7zrversion: '==0.22.*'
|
# extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
||||||
extra: '--base ${{ env.QT_MIRROR }}'
|
|
||||||
|
|
||||||
- name: 'Install android_arm64_v8a Qt'
|
# - name: 'Install android_arm64_v8a Qt'
|
||||||
uses: jurplel/install-qt-action@v4
|
# uses: jurplel/install-qt-action@v4
|
||||||
with:
|
# with:
|
||||||
version: ${{ env.QT_VERSION }}
|
# version: ${{ env.QT_VERSION }}
|
||||||
host: 'linux'
|
# host: 'linux'
|
||||||
target: 'android'
|
# target: 'android'
|
||||||
arch: 'android_arm64_v8a'
|
# arch: 'android_arm64_v8a'
|
||||||
modules: ${{ env.QT_MODULES }}
|
# modules: ${{ env.QT_MODULES }}
|
||||||
dir: ${{ runner.temp }}
|
# dir: ${{ runner.temp }}
|
||||||
py7zrversion: '==0.22.*'
|
# extra: '--external 7z --base ${{ env.QT_MIRROR }}'
|
||||||
extra: '--base ${{ env.QT_MIRROR }}'
|
|
||||||
|
|
||||||
- name: 'Grant execute permission for qt-cmake'
|
# - name: 'Grant execute permission for qt-cmake'
|
||||||
shell: bash
|
# shell: bash
|
||||||
run: |
|
# run: |
|
||||||
chmod +x ${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android_x86_64/bin/qt-cmake
|
# chmod +x ${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android_x86_64/bin/qt-cmake
|
||||||
|
|
||||||
- name: 'Get sources'
|
# - name: 'Get sources'
|
||||||
uses: actions/checkout@v4
|
# uses: actions/checkout@v4
|
||||||
with:
|
# with:
|
||||||
submodules: 'true'
|
# submodules: 'true'
|
||||||
|
|
||||||
- name: 'Setup ccache'
|
# - name: 'Setup ccache'
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
# uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
|
||||||
- name: 'Setup Java'
|
# - name: 'Setup Java'
|
||||||
uses: actions/setup-java@v4
|
# uses: actions/setup-java@v4
|
||||||
with:
|
# with:
|
||||||
distribution: 'temurin'
|
# distribution: 'temurin'
|
||||||
java-version: '17'
|
# java-version: '17'
|
||||||
cache: 'gradle'
|
# cache: 'gradle'
|
||||||
|
|
||||||
- name: 'Setup Android NDK'
|
# - name: 'Setup Android NDK'
|
||||||
id: setup-ndk
|
# id: setup-ndk
|
||||||
uses: nttld/setup-ndk@v1
|
# uses: nttld/setup-ndk@v1
|
||||||
with:
|
# with:
|
||||||
ndk-version: 'r26b'
|
# ndk-version: 'r26b'
|
||||||
|
|
||||||
- name: 'Decode keystore secret to file'
|
# - name: 'Decode keystore secret to file'
|
||||||
env:
|
# env:
|
||||||
KEYSTORE_BASE64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_BASE64 }}
|
# KEYSTORE_BASE64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_BASE64 }}
|
||||||
shell: bash
|
# shell: bash
|
||||||
run: |
|
# run: |
|
||||||
echo $KEYSTORE_BASE64 | base64 --decode > android.keystore
|
# echo $KEYSTORE_BASE64 | base64 --decode > android.keystore
|
||||||
|
|
||||||
- name: 'Build project'
|
# - name: 'Build project'
|
||||||
env:
|
# env:
|
||||||
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
|
# ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
|
||||||
QT_HOST_PATH: ${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64
|
# QT_HOST_PATH: ${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64
|
||||||
ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/android.keystore
|
# ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/android.keystore
|
||||||
ANDROID_KEYSTORE_KEY_ALIAS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_ALIAS }}
|
# ANDROID_KEYSTORE_KEY_ALIAS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_ALIAS }}
|
||||||
ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_PASS }}
|
# ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_PASS }}
|
||||||
shell: bash
|
# shell: bash
|
||||||
run: ./deploy/build_android.sh --aab --apk all --build-platform ${{ env.ANDROID_BUILD_PLATFORM }}
|
# run: ./deploy/build_android.sh --aab --apk all --build-platform ${{ env.ANDROID_BUILD_PLATFORM }}
|
||||||
|
|
||||||
- name: 'Upload x86_64 apk'
|
# - name: 'Upload x86_64 apk'
|
||||||
uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
with:
|
# with:
|
||||||
name: AmneziaVPN-android-x86_64
|
# name: AmneziaVPN-android-x86_64
|
||||||
path: deploy/build/AmneziaVPN-x86_64-release.apk
|
# path: deploy/build/AmneziaVPN-x86_64-release.apk
|
||||||
compression-level: 0
|
# compression-level: 0
|
||||||
retention-days: 7
|
# retention-days: 7
|
||||||
|
|
||||||
- name: 'Upload x86 apk'
|
# - name: 'Upload x86 apk'
|
||||||
uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
with:
|
# with:
|
||||||
name: AmneziaVPN-android-x86
|
# name: AmneziaVPN-android-x86
|
||||||
path: deploy/build/AmneziaVPN-x86-release.apk
|
# path: deploy/build/AmneziaVPN-x86-release.apk
|
||||||
compression-level: 0
|
# compression-level: 0
|
||||||
retention-days: 7
|
# retention-days: 7
|
||||||
|
|
||||||
- name: 'Upload arm64-v8a apk'
|
# - name: 'Upload arm64-v8a apk'
|
||||||
uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
with:
|
# with:
|
||||||
name: AmneziaVPN-android-arm64-v8a
|
# name: AmneziaVPN-android-arm64-v8a
|
||||||
path: deploy/build/AmneziaVPN-arm64-v8a-release.apk
|
# path: deploy/build/AmneziaVPN-arm64-v8a-release.apk
|
||||||
compression-level: 0
|
# compression-level: 0
|
||||||
retention-days: 7
|
# retention-days: 7
|
||||||
|
|
||||||
- name: 'Upload armeabi-v7a apk'
|
# - name: 'Upload armeabi-v7a apk'
|
||||||
uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
with:
|
# with:
|
||||||
name: AmneziaVPN-android-armeabi-v7a
|
# name: AmneziaVPN-android-armeabi-v7a
|
||||||
path: deploy/build/AmneziaVPN-armeabi-v7a-release.apk
|
# path: deploy/build/AmneziaVPN-armeabi-v7a-release.apk
|
||||||
compression-level: 0
|
# compression-level: 0
|
||||||
retention-days: 7
|
# retention-days: 7
|
||||||
|
|
||||||
- name: 'Upload aab'
|
# - name: 'Upload aab'
|
||||||
uses: actions/upload-artifact@v4
|
# uses: actions/upload-artifact@v4
|
||||||
with:
|
# with:
|
||||||
name: AmneziaVPN-android
|
# name: AmneziaVPN-android
|
||||||
path: deploy/build/AmneziaVPN-release.aab
|
# path: deploy/build/AmneziaVPN-release.aab
|
||||||
compression-level: 0
|
# compression-level: 0
|
||||||
retention-days: 7
|
# retention-days: 7
|
||||||
|
|
||||||
Extra:
|
Extra:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,21 @@ INSTALLER_DATA_DIR=$BUILD_DIR/installer/packages/$APP_DOMAIN/data
|
||||||
INSTALLER_BUNDLE_DIR=$BUILD_DIR/installer/$APP_FILENAME
|
INSTALLER_BUNDLE_DIR=$BUILD_DIR/installer/$APP_FILENAME
|
||||||
DMG_FILENAME=$PROJECT_DIR/${APP_NAME}.dmg
|
DMG_FILENAME=$PROJECT_DIR/${APP_NAME}.dmg
|
||||||
|
|
||||||
|
# Copy provisioning profiles
|
||||||
|
mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles/"
|
||||||
|
|
||||||
|
echo $MACOS_APP_PROVISIONING_PROFILE | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision
|
||||||
|
echo $MACOS_NE_PROVISIONING_PROFILE | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision
|
||||||
|
|
||||||
|
shasum -a 256 ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision
|
||||||
|
shasum -a 256 ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision
|
||||||
|
|
||||||
|
macos_app_uuid=`grep UUID -A1 -a ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision | grep -io "[-A-F0-9]\{36\}"`
|
||||||
|
macos_ne_uuid=`grep UUID -A1 -a ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision | grep -io "[-A-F0-9]\{36\}"`
|
||||||
|
|
||||||
|
mv ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/$macos_app_uuid.mobileprovision
|
||||||
|
mv ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/$macos_ne_uuid.mobileprovision
|
||||||
|
|
||||||
# Check if QIF_VERSION is properly set, otherwise set a default
|
# Check if QIF_VERSION is properly set, otherwise set a default
|
||||||
if [ -z "${QIF_VERSION+x}" ]; then
|
if [ -z "${QIF_VERSION+x}" ]; then
|
||||||
echo "QIF_VERSION is not set, using default 4.6"
|
echo "QIF_VERSION is not set, using default 4.6"
|
||||||
|
|
@ -57,7 +72,6 @@ $QT_BIN_DIR/qt-cmake .. -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR -DMACOS_NE=TRU
|
||||||
# Xác định target hợp lệ và build
|
# Xác định target hợp lệ và build
|
||||||
cmake --build . --config release --target AmneziaVPN # Hoặc target chính xác của bạn
|
cmake --build . --config release --target AmneziaVPN # Hoặc target chính xác của bạn
|
||||||
|
|
||||||
|
|
||||||
# Build and run tests here
|
# Build and run tests here
|
||||||
|
|
||||||
echo "____________________________________"
|
echo "____________________________________"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue