Skip to content

Commit eddc202

Browse files
hiddify-comhiddify-com
authored
Merge pull request #1995 from veto9292/main
black screen and running issue on Windows | shared_preferences conflict between portable and exe on Windows | AppImage running on arch etc… | linux build in ci | add .AppImage release next to the tar | replace ir shir flag | add background for dmg format
2 parents 3fcf6a0 + 5029f1b commit eddc202

31 files changed

Lines changed: 363 additions & 245 deletions

‎.github/workflows/build.yml‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ env:
2020
UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}"
2121
TAG_NAME: "${{ inputs.tag-name }}"
2222
TARGET_NAME_gz: "Hiddify-Linux-x64-AppImage.tar"
23+
TARGET_NAME_AppImage: "Hiddify-Linux-x64-AppImage"
2324
TARGET_NAME_deb: "Hiddify-Debian-x64"
2425
# TARGET_NAME_rpm: "Hiddify-rpm-x64"
2526
TARGET_NAME_apk: "Hiddify-Android"
@@ -64,18 +65,23 @@ jobs:
6465
fail-fast: false
6566
matrix:
6667
include:
67-
# - platform: android-apk
68-
# os: ubuntu-latest
69-
# targets: apk
68+
- platform: android-apk
69+
os: ubuntu-latest
70+
targets: apk
7071

7172
- platform: android-aab
7273
os: ubuntu-latest
7374
targets: aab
7475

75-
# - platform: windows
76-
# os: windows-latest
77-
# aarch: amd64
78-
# targets: exe,msix,zip
76+
- platform: windows
77+
os: windows-latest
78+
aarch: amd64
79+
targets: exe,msix,zip
80+
81+
- platform: linux
82+
os: ubuntu-22.04
83+
aarch: amd64
84+
targets: deb,gz,AppImage
7985

8086
# - platform: linux-amd64
8187
# os: ubuntu-22.04
@@ -97,10 +103,10 @@ jobs:
97103
# aarch: arm64
98104
# targets: deb,gz
99105

100-
# - platform: macos
101-
# os: macos-15
102-
# aarch: universal
103-
# targets: dmg,pkg
106+
- platform: macos
107+
os: macos-15
108+
aarch: universal
109+
targets: dmg,pkg
104110

105111
# - platform: ios
106112
# os: macos-15
@@ -133,21 +139,21 @@ jobs:
133139

134140

135141

136-
- name: Setup Flutter for arm64
137-
if: ${{ startsWith(matrix.platform,'linux-arm64') }}
138-
uses: hurelhuyag/flutter-arm64-action@HEAD
139-
with:
140-
channel: 'stable'
141-
flutter-version: ${{ env.FLUTTER_VERSION }}
142+
# - name: Setup Flutter for arm64
143+
# if: ${{ startsWith(matrix.platform,'linux-arm64') }}
144+
# uses: hurelhuyag/flutter-arm64-action@HEAD
145+
# with:
146+
# channel: 'stable'
147+
# flutter-version: ${{ env.FLUTTER_VERSION }}
142148

143149
- name: Setup Flutter
144-
if: ${{ !startsWith(matrix.platform, 'linux-arm64') }}
145150
uses: subosito/flutter-action@v2.21.0 #issue with 2.13
146151
with:
147152
flutter-version: ${{ env.FLUTTER_VERSION }}
148153
# flutter-version-file: pubspec.yaml
149154
channel: 'stable'
150155
cache: true
156+
151157
- name: Clean up disk space
152158
if: startsWith(matrix.platform,'android')
153159
run: |

‎Makefile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ ios-prepare: common-prepare ios-libs
9292
cd ios; pod repo update; pod install;echo "done ios prepare"
9393

9494
macos-prepare: common-prepare macos-libs
95-
linux-prepare: common-prepare linux-libs
95+
linux-prepare: common-prepare linux-amd64-libs
9696

9797

9898
linux-amd64-prepare: common-prepare linux-amd64-libs
@@ -388,6 +388,8 @@ linux-appimage-release:
388388
sed -i '/^\[Desktop Entry\]/a StartupWMClass=app.hiddify.com' "squashfs-root/hiddify.desktop"; \
389389
$(BLUE)Removing old AppImage$(DONE); \
390390
rm *.AppImage; \
391+
$(BLUE)Deleting bundled libstdc++ to fix Arch Linux compatibility...$(DONE); \
392+
find squashfs-root/usr/lib -name "libstdc++.so.6" -delete; \
391393
$(BLUE)Rebuilding AppImage$(DONE); \
392394
ARCH=x86_64 appimagetool --no-appstream squashfs-root Hiddify.AppImage > /dev/null; \
393395
$(BLUE)Cleaning up squashfs$(DONE); \
@@ -396,8 +398,8 @@ linux-appimage-release:
396398
PKG_DIR_NAME="hiddify-linux-appimage"; \
397399
$(BLUE)Creating dir: $$PKG_DIR_NAME$(DONE); \
398400
mkdir -p "$$PKG_DIR_NAME"; \
399-
$(BLUE)Moving and Renaming to Hiddify.AppImage$(DONE); \
400-
mv "Hiddify.AppImage" "$$PKG_DIR_NAME/Hiddify.AppImage"; \
401+
$(BLUE)Moving Hiddify.AppImage$(DONE); \
402+
cp -p "Hiddify.AppImage" "$$PKG_DIR_NAME/Hiddify.AppImage"; \
401403
$(BLUE)Creating Portable Home directory$(DONE); \
402404
mkdir -p "$$PKG_DIR_NAME/Hiddify.AppImage.home"; \
403405
$(BLUE)Compressing to .tar.gz$(DONE); \

‎assets/translations/ar.i18n.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,13 @@
279279
},
280280
"region": "المنطقة",
281281
"regions": {
282-
"ir": "إيران (ir) 🇮🇷",
283-
"cn": "الصين (cn) 🇨🇳",
284-
"ru": "روسيا (ru) 🇷🇺",
285-
"af": "أفغانستان (af) 🇦🇫",
286-
"id": "إندونيسيا (id) 🇮🇩",
287-
"tr": "تركيا (tr) 🇹🇷",
288-
"br": "البرازيل (br) 🇧🇷",
282+
"ir": "إيران (ir)",
283+
"cn": "الصين (cn)",
284+
"ru": "روسيا (ru)",
285+
"af": "أفغانستان (af)",
286+
"id": "إندونيسيا (id)",
287+
"tr": "تركيا (tr)",
288+
"br": "البرازيل (br)",
289289
"other": "أخرى"
290290
},
291291
"balancerStrategy": {

‎assets/translations/en.i18n.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,13 @@
274274
},
275275
"region": "Region",
276276
"regions": {
277-
"ir": "Iran (ir) 🇮🇷",
278-
"cn": "China (cn) 🇨🇳",
279-
"ru": "Russia (ru) 🇷🇺",
280-
"af": "Afghanistan (af) 🇦🇫",
281-
"id": "Indonesia (id) 🇮🇩",
282-
"tr": "Türkiye (tr) 🇹🇷",
283-
"br": "Brazil (br) 🇧🇷",
277+
"ir": "Iran (ir)",
278+
"cn": "China (cn)",
279+
"ru": "Russia (ru)",
280+
"af": "Afghanistan (af)",
281+
"id": "Indonesia (id)",
282+
"tr": "Türkiye (tr)",
283+
"br": "Brazil (br)",
284284
"other": "Other"
285285
},
286286
"balancerStrategy": {

‎assets/translations/es.i18n.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,13 @@
273273
},
274274
"region": "Región",
275275
"regions": {
276-
"ir": "Irán (ir) 🇮🇷",
277-
"cn": "China (cn) 🇨🇳",
278-
"ru": "Rusia (ru) 🇷🇺",
279-
"af": "Afganistán (af) 🇦🇫",
280-
"id": "Indonesia (id) 🇮🇩",
281-
"tr": "Turquía (tr) 🇹🇷",
282-
"br": "Brasil (br) 🇧🇷",
276+
"ir": "Irán (ir)",
277+
"cn": "China (cn)",
278+
"ru": "Rusia (ru)",
279+
"af": "Afganistán (af)",
280+
"id": "Indonesia (id)",
281+
"tr": "Turquía (tr)",
282+
"br": "Brasil (br)",
283283
"other": "Otro"
284284
},
285285
"balancerStrategy": {

‎assets/translations/fa.i18n.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,13 @@
273273
},
274274
"region": "منطقه",
275275
"regions": {
276-
"ir": "ایران (ir) 🇮🇷",
277-
"cn": "چین (cn) 🇨🇳",
278-
"ru": "روسیه (ru) 🇷🇺",
279-
"af": "افغانستان (af) 🇦🇫",
280-
"id": "اندونزی (id) 🇮🇩",
281-
"tr": "ترکیه (tr) 🇹🇷",
282-
"br": "برزیل (br) 🇧🇷",
276+
"ir": "ایران (ir)",
277+
"cn": "چین (cn)",
278+
"ru": "روسیه (ru)",
279+
"af": "افغانستان (af)",
280+
"id": "اندونزی (id)",
281+
"tr": "ترکیه (tr)",
282+
"br": "برزیل (br)",
283283
"other": "سایر"
284284
},
285285
"balancerStrategy": {

‎assets/translations/fr.i18n.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,13 @@
273273
},
274274
"region": "Région",
275275
"regions": {
276-
"ir": "Iran (ir) 🇮🇷",
277-
"cn": "Chine (cn) 🇨🇳",
278-
"ru": "Russie (ru) 🇷🇺",
279-
"af": "Afghanistan (af) 🇦🇫",
280-
"id": "Indonésie (id) 🇮🇩",
281-
"tr": "Turquie (tr) 🇹🇷",
282-
"br": "Brésil (br) 🇧🇷",
276+
"ir": "Iran (ir)",
277+
"cn": "Chine (cn)",
278+
"ru": "Russie (ru)",
279+
"af": "Afghanistan (af)",
280+
"id": "Indonésie (id)",
281+
"tr": "Turquie (tr)",
282+
"br": "Brésil (br)",
283283
"other": "Autre"
284284
},
285285
"balancerStrategy": {

‎assets/translations/id.i18n.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,13 @@
273273
},
274274
"region": "Wilayah",
275275
"regions": {
276-
"ir": "Iran (ir) 🇮🇷",
277-
"cn": "Tiongkok (cn) 🇨🇳",
278-
"ru": "Rusia (ru) 🇷🇺",
279-
"af": "Afghanistan (af) 🇦🇫",
280-
"id": "Indonesia (id) 🇮🇩",
281-
"tr": "Turki (tr) 🇹🇷",
282-
"br": "Brasil (br) 🇧🇷",
276+
"ir": "Iran (ir)",
277+
"cn": "Tiongkok (cn)",
278+
"ru": "Rusia (ru)",
279+
"af": "Afghanistan (af)",
280+
"id": "Indonesia (id)",
281+
"tr": "Turki (tr)",
282+
"br": "Brasil (br)",
283283
"other": "Lainnya"
284284
},
285285
"balancerStrategy": {

‎assets/translations/pt-BR.i18n.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,13 @@
273273
},
274274
"region": "Região",
275275
"regions": {
276-
"ir": "Irã (ir) 🇮🇷",
277-
"cn": "China (cn) 🇨🇳",
278-
"ru": "Rússia (ru) 🇷🇺",
279-
"af": "Afeganistão (af) 🇦🇫",
280-
"id": "Indonésia (id) 🇮🇩",
281-
"tr": "Turquia (tr) 🇹🇷",
282-
"br": "Brasil (br) 🇧🇷",
276+
"ir": "Irã (ir)",
277+
"cn": "China (cn)",
278+
"ru": "Rússia (ru)",
279+
"af": "Afeganistão (af)",
280+
"id": "Indonésia (id)",
281+
"tr": "Turquia (tr)",
282+
"br": "Brasil (br)",
283283
"other": "Outro"
284284
},
285285
"balancerStrategy": {

‎assets/translations/ru.i18n.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -277,13 +277,13 @@
277277
},
278278
"region": "Регион",
279279
"regions": {
280-
"ir": "Иран (ir) 🇮🇷",
281-
"cn": "Китай (cn) 🇨🇳",
282-
"ru": "Россия (ru) 🇷🇺",
283-
"af": "Афганистан (af) 🇦🇫",
284-
"id": "Индонезия (id) 🇮🇩",
285-
"tr": "Турция (tr) 🇹🇷",
286-
"br": "Бразилия (br) 🇧🇷",
280+
"ir": "Иран (ir)",
281+
"cn": "Китай (cn)",
282+
"ru": "Россия (ru)",
283+
"af": "Афганистан (af)",
284+
"id": "Индонезия (id)",
285+
"tr": "Турция (tr)",
286+
"br": "Бразилия (br)",
287287
"other": "Другой"
288288
},
289289
"balancerStrategy": {

0 commit comments

Comments
 (0)
⚡