fix: windows?
This commit is contained in:
10
.github/workflows/build.yml
vendored
10
.github/workflows/build.yml
vendored
@@ -26,6 +26,7 @@ env:
|
||||
"aab": "Hiddify-Android",
|
||||
"exe": "Hiddify-Windows-x64",
|
||||
"dmg": "Hiddify-MacOS",
|
||||
"pkg": "Hiddify-MacOS-Installer",
|
||||
"ipa": "Hiddify-iOS",
|
||||
}
|
||||
jobs:
|
||||
@@ -56,7 +57,7 @@ jobs:
|
||||
- platform: macos
|
||||
os: macos-13
|
||||
aarch: universal
|
||||
targets: dmg
|
||||
targets: dmg,pkg
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
@@ -91,6 +92,7 @@ jobs:
|
||||
- name: Prepare for ${{ matrix.platform }}
|
||||
run: |
|
||||
make ${{ matrix.platform }}-prepare
|
||||
tree
|
||||
|
||||
- name: Setup Android Signing Properties
|
||||
if: startsWith(matrix.platform,'android')
|
||||
@@ -158,6 +160,8 @@ jobs:
|
||||
.\scripts\package_windows.ps1
|
||||
|
||||
- name: Copy to out Android APK
|
||||
env:
|
||||
TARGET_MAP: ${{ env.TARGET_MAP }}
|
||||
if: matrix.platform == 'android-apk'
|
||||
run: |
|
||||
mkdir out
|
||||
@@ -169,6 +173,8 @@ jobs:
|
||||
|
||||
- name: Copy to out Android AAB
|
||||
if: matrix.platform == 'android-aab'
|
||||
env:
|
||||
TARGET_MAP: ${{ env.TARGET_MAP }}
|
||||
run: |
|
||||
mkdir out
|
||||
ls -R ./build/app/outputs
|
||||
@@ -176,6 +182,8 @@ jobs:
|
||||
|
||||
- name: Copy to out unix
|
||||
if: startsWith(matrix.platform,'linux') || matrix.platform == 'macos' || matrix.platform == 'ios'
|
||||
env:
|
||||
TARGET_MAP: ${{ env.TARGET_MAP }}
|
||||
run: |
|
||||
ls -R dist/
|
||||
mkdir out
|
||||
|
||||
9
Makefile
9
Makefile
@@ -1,5 +1,5 @@
|
||||
include dependencies.properties
|
||||
ifeq ($(OS),Windows_NT)
|
||||
ifeq ($(OS),Windows_1NT)
|
||||
MKDIR := -mkdir
|
||||
RM := rmdir /s /q
|
||||
SEP:=\\
|
||||
@@ -73,7 +73,7 @@ android-aab-prepare:android-prepare
|
||||
macos-install-dependencies:
|
||||
brew install create-dmg tree
|
||||
npm install -g appdmg
|
||||
dart pub global activate --source git https://github.com/hiddify/flutter_distributor --git-path packages/flutter_distributor
|
||||
dart pub global activate flutter_distributor
|
||||
|
||||
ios-install-dependencies:
|
||||
echo "not yet implemented"
|
||||
@@ -96,6 +96,7 @@ linux-install-dependencies:
|
||||
echo 'export PATH="$$PATH:$$HOME/.pub-cache/bin"' >>~/.bashrc
|
||||
sudo apt install -y clang ninja-build pkg-config cmake libgtk-3-dev locate ninja-build pkg-config libgtk-3-dev libglib2.0-dev libgio2.0-cil-dev libayatana-appindicator3-dev fuse rpm patchelf file appstream
|
||||
|
||||
|
||||
sudo modprobe fuse
|
||||
wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
|
||||
chmod +x appimagetool
|
||||
@@ -104,7 +105,7 @@ linux-install-dependencies:
|
||||
dart pub global activate --source git https://github.com/hiddify/flutter_distributor --git-path packages/flutter_distributor
|
||||
|
||||
windows-install-dependencies:
|
||||
dart pub global activate --source git https://github.com/hiddify/flutter_distributor --git-path packages/flutter_distributor
|
||||
dart pub global activate flutter_distributor
|
||||
|
||||
sync_translate:
|
||||
cd .github && bash sync_translate.sh
|
||||
@@ -142,7 +143,7 @@ android-aab-libs: android-libs
|
||||
windows-libs:
|
||||
$(MKDIR) $(DESKTOP_OUT) || echo Folder already exists. Skipping...
|
||||
curl -L $(CORE_URL)/$(CORE_NAME)-windows-amd64.tar.gz | tar xz -C $(DESKTOP_OUT)$(SEP)
|
||||
ls $(DESKTOP_OUT)$(SEP) || dir $(DESKTOP_OUT)$(SEP) || tree
|
||||
ls $(DESKTOP_OUT) || dir $(DESKTOP_OUT)$(SEP)
|
||||
|
||||
linux-libs:
|
||||
mkdir -p $(DESKTOP_OUT)
|
||||
|
||||
2
macos/packaging/pkg/make_config.yaml
Normal file
2
macos/packaging/pkg/make_config.yaml
Normal file
@@ -0,0 +1,2 @@
|
||||
install-path: /Applications
|
||||
#sign-identity: <your-sign-identity>
|
||||
Reference in New Issue
Block a user