Skip to content

Commit

Permalink
Add prebuilt submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
outspace committed Jun 8, 2023
1 parent a116774 commit a69170c
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ jobs:
sudo apt-get install libxkbcommon-x11-0
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
ls client/3rd-prebuilt
echo "***"
ls deploy/data/deploy-prebuilt
bash deploy/build_linux.sh
- name: 'Upload installer artifact'
Expand Down Expand Up @@ -102,6 +105,8 @@ jobs:
set BUILD_ARCH=${{ env.BUILD_ARCH }}
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"
dir client/3rd-prebuilt
dir deploy/data/deploy-prebuilt
call deploy\\build_windows.bat
- name: 'Upload installer artifact'
Expand Down Expand Up @@ -179,6 +184,9 @@ jobs:
export QT_MACOS_ROOT_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos"
export QT_IOS_BIN=$QT_BIN_DIR
export PATH=$PATH:~/go/bin
ls client/3rd-prebuilt
echo "***"
ls deploy/data/deploy-prebuilt
mkdir build-ios
$QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,6 @@
[submodule "client/3rd/mbedtls"]
path = client/3rd/mbedtls
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
1 change: 1 addition & 0 deletions client/3rd-prebuilt
Submodule 3rd-prebuilt added at 5e17a5
1 change: 1 addition & 0 deletions deploy/data/deploy-prebuilt

0 comments on commit a69170c

Please sign in to comment.