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

Use prebuilt binary from 3rd-prebuilt for MacOS installer

Browse Source
This commit is contained in:
Mykola Baibuz
2023-06-11 14:56:26 -04:00
parent bd562f255d
commit 8a8dd47f8b
8 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/deploy.yml
-1
View File
@@ -43,7 +43,6 @@ jobs:
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 ls client/3rd-prebuilt
echo "***" echo "***"
ls deploy/data/deploy-prebuilt
bash deploy/build_linux.sh bash deploy/build_linux.sh
- name: 'Upload installer artifact' - name: 'Upload installer artifact'
client/3rd-prebuilt
+1 -1
Submodule client/3rd-prebuilt updated: 46c448a874...df1771fcfc
deploy/build_linux.sh
+2 -2
View File
@@ -28,7 +28,7 @@ APP_FILENAME=$APP_NAME.app
APP_DOMAIN=org.amneziavpn.package APP_DOMAIN=org.amneziavpn.package
DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/linux DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/linux
PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/deploy-prebuilt/linux/client/bin PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/client/3rd-prebuilt/deploy-prebuilt/linux/client/bin
INSTALLER_DATA_DIR=$PROJECT_DIR/deploy/installer/packages/$APP_DOMAIN/data INSTALLER_DATA_DIR=$PROJECT_DIR/deploy/installer/packages/$APP_DOMAIN/data
PRO_FILE_PATH=$PROJECT_DIR/$APP_NAME.pro PRO_FILE_PATH=$PROJECT_DIR/$APP_NAME.pro
@@ -63,7 +63,7 @@ cmake --build . --config release
#echo "............Deploy.................." #echo "............Deploy.................."
cp -r $DEPLOY_DATA_DIR/* $APP_DIR cp -r $DEPLOY_DATA_DIR/* $APP_DIR
cp -r PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/deploy-prebuilt/linux/client/bin/* $APP_DIR cp -r $PREBUILT_DEPLOY_DATA_DIR $APP_DIR
if [ ! -f $CQTDEPLOYER_DIR/cqtdeployer.sh ]; then if [ ! -f $CQTDEPLOYER_DIR/cqtdeployer.sh ]; then
wget -O $TOOLS_DIR/CQtDeployer.zip https://github.com/QuasarApp/CQtDeployer/releases/download/v1.5.4.17/CQtDeployer_1.5.4.17_Linux_x86_64.zip wget -O $TOOLS_DIR/CQtDeployer.zip https://github.com/QuasarApp/CQtDeployer/releases/download/v1.5.4.17/CQtDeployer_1.5.4.17_Linux_x86_64.zip
deploy/build_macos.sh
+3
View File
@@ -28,7 +28,9 @@ PLIST_NAME=$APP_NAME.plist
OUT_APP_DIR=$BUILD_DIR/client OUT_APP_DIR=$BUILD_DIR/client
BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME
PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/deploy-prebuilt/macos
DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/macos DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/macos
INSTALLER_DATA_DIR=$BUILD_DIR/installer/packages/$APP_DOMAIN/data 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
@@ -114,6 +116,7 @@ fi
echo "Packaging installer..." echo "Packaging installer..."
mkdir -p $INSTALLER_DATA_DIR mkdir -p $INSTALLER_DATA_DIR
cp -av $PROJECT_DIR/deploy/installer $BUILD_DIR cp -av $PROJECT_DIR/deploy/installer $BUILD_DIR
cp -r $PREBUILT_DEPLOY_DATA_DIR/* $DEPLOY_DATA_DIR
cp -av $DEPLOY_DATA_DIR/post_install.sh $INSTALLER_DATA_DIR/post_install.sh cp -av $DEPLOY_DATA_DIR/post_install.sh $INSTALLER_DATA_DIR/post_install.sh
cp -av $DEPLOY_DATA_DIR/post_uninstall.sh $INSTALLER_DATA_DIR/post_uninstall.sh cp -av $DEPLOY_DATA_DIR/post_uninstall.sh $INSTALLER_DATA_DIR/post_uninstall.sh
cp -av $DEPLOY_DATA_DIR/$PLIST_NAME $INSTALLER_DATA_DIR/$PLIST_NAME cp -av $DEPLOY_DATA_DIR/$PLIST_NAME $INSTALLER_DATA_DIR/$PLIST_NAME
deploy/data/macos/ck-client
BIN
View File
Binary file not shown.
deploy/data/macos/openvpn
BIN
View File
Binary file not shown.
deploy/data/macos/ss-local
BIN
View File
Binary file not shown.
deploy/data/macos/ss-tunnel
BIN
View File
Binary file not shown.