andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Add prebuilt submodule

Browse Source
This commit is contained in:
Mykola Baibuz
2023-06-07 17:11:12 -04:00
parent a116774104
commit 5fc57d287b
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/deploy.yml
+15 -5
View File
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
QT_VERSION: 6.5.0 QT_VERSION: 6.4.2
QIF_VERSION: 4.5 QIF_VERSION: 4.5
steps: steps:
@@ -41,6 +41,9 @@ jobs:
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
ls client/3rd-prebuilt
echo "***"
ls deploy/data/deploy-prebuilt
bash deploy/build_linux.sh bash deploy/build_linux.sh
- name: 'Upload installer artifact' - name: 'Upload installer artifact'
@@ -63,7 +66,7 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
env: env:
QT_VERSION: 6.5.0 QT_VERSION: 6.4.2
QIF_VERSION: 4.5 QIF_VERSION: 4.5
BUILD_ARCH: 64 BUILD_ARCH: 64
@@ -102,6 +105,10 @@ jobs:
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"
dir client\3rd-prebuilt
cd deploy\data\deploy-prebuilt\windows\x32
dir
cd ..\..\..\..\..
call deploy\\build_windows.bat call deploy\\build_windows.bat
- name: 'Upload installer artifact' - name: 'Upload installer artifact'
@@ -124,7 +131,7 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
env: env:
QT_VERSION: 6.5.0 QT_VERSION: 6.4.2
steps: steps:
- name: 'Setup xcode' - name: 'Setup xcode'
@@ -179,6 +186,9 @@ jobs:
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 QT_IOS_BIN=$QT_BIN_DIR export QT_IOS_BIN=$QT_BIN_DIR
export PATH=$PATH:~/go/bin export PATH=$PATH:~/go/bin
ls client/3rd-prebuilt
echo "***"
ls deploy/data/deploy-prebuilt
mkdir build-ios mkdir build-ios
$QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR $QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR
@@ -199,7 +209,7 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
env: env:
QT_VERSION: 6.5.0 QT_VERSION: 6.4.2
QIF_VERSION: 4.5 QIF_VERSION: 4.5
steps: steps:
@@ -262,7 +272,7 @@ jobs:
arch: ['android_x86_64', 'android_x86'] #, 'android_armv7', 'android_arm64_v8a'] arch: ['android_x86_64', 'android_x86'] #, 'android_armv7', 'android_arm64_v8a']
env: env:
QT_VERSION: 6.5.0 QT_VERSION: 6.4.2
steps: steps:
- name: 'Install desktop Qt' - name: 'Install desktop Qt'
.gitmodules
+3
View File
@@ -58,3 +58,6 @@
[submodule "client/3rd/mbedtls"] [submodule "client/3rd/mbedtls"]
path = client/3rd/mbedtls path = client/3rd/mbedtls
url = https://github.com/Mbed-TLS/mbedtls.git url = https://github.com/Mbed-TLS/mbedtls.git
[submodule "client/3rd-prebuilt"]
path = client/3rd-prebuilt
url = git@github.com:amnezia-vpn/3rd-prebuilt.git
client/3rd-prebuilt
Submodule
+1
Submodule client/3rd-prebuilt added at 5e17a5036b
deploy/data/deploy-prebuilt
Symlink
+1
View File
@@ -0,0 +1 @@
../../client/3rd-prebuilt/deploy-prebuilt/