fix: dynamic varible in github action
This commit is contained in:
49
.github/workflows/build.yml
vendored
49
.github/workflows/build.yml
vendored
@@ -13,22 +13,20 @@ on:
|
|||||||
default: "dev"
|
default: "dev"
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
IS_GITHUB_ACTIONS: 1
|
||||||
CHANNEL: "${{ inputs.channel }}"
|
CHANNEL: "${{ inputs.channel }}"
|
||||||
NDK_VERSION: r26b
|
NDK_VERSION: r26b
|
||||||
UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}"
|
UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}"
|
||||||
TAG_NAME: "${{ inputs.tag-name }}"
|
TAG_NAME: "${{ inputs.tag-name }}"
|
||||||
TARGET_MAP: |
|
TARGET_NAME_AppImage: "Hiddify-Linux-x64"
|
||||||
{
|
TARGET_NAME_deb": "Hiddify-Debian-x64"
|
||||||
"AppImage": "Hiddify-Linux-x64",
|
TARGET_NAME_rpm": "Hiddify-rpm-x64"
|
||||||
"deb": "Hiddify-Debian-x64",
|
TARGET_NAME_apk": "Hiddify-Android"
|
||||||
"rpm": "Hiddify-rpm-x64",
|
TARGET_NAME_aab": "Hiddify-Android"
|
||||||
"apk": "Hiddify-Android",
|
TARGET_NAME_exe": "Hiddify-Windows-x64"
|
||||||
"aab": "Hiddify-Android",
|
TARGET_NAME_dmg": "Hiddify-MacOS"
|
||||||
"exe": "Hiddify-Windows-x64",
|
TARGET_NAME_pkg": "Hiddify-MacOS-Installer"
|
||||||
"dmg": "Hiddify-MacOS",
|
TARGET_NAME_ipa": "Hiddify-iOS"
|
||||||
"pkg": "Hiddify-MacOS-Installer",
|
|
||||||
"ipa": "Hiddify-iOS",
|
|
||||||
}
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
permissions: write-all
|
permissions: write-all
|
||||||
@@ -160,21 +158,17 @@ jobs:
|
|||||||
.\scripts\package_windows.ps1
|
.\scripts\package_windows.ps1
|
||||||
|
|
||||||
- name: Copy to out Android APK
|
- name: Copy to out Android APK
|
||||||
env:
|
|
||||||
TARGET_MAP: ${{ env.TARGET_MAP }}
|
|
||||||
if: matrix.platform == 'android-apk'
|
if: matrix.platform == 'android-apk'
|
||||||
run: |
|
run: |
|
||||||
mkdir out
|
mkdir out
|
||||||
ls -R ./build/app/outputs
|
ls -R ./build/app/outputs
|
||||||
cp ./build/app/outputs/flutter-apk/*arm64-v8a*.apk out/${TARGET_MAP[apk]}-arm64.apk || echo "no arm64 apk"
|
cp ./build/app/outputs/flutter-apk/*arm64-v8a*.apk out/${TARGET_NAME_apk}-arm64.apk || echo "no arm64 apk"
|
||||||
cp ./build/app/outputs/flutter-apk/*armeabi-v7a*.apk out/${TARGET_MAP[apk]}-arm7.apk || echo "no arm7 apk"
|
cp ./build/app/outputs/flutter-apk/*armeabi-v7a*.apk out/${TARGET_NAME_apk}-arm7.apk || echo "no arm7 apk"
|
||||||
cp ./build/app/outputs/flutter-apk/*x86_64*.apk out/${TARGET_MAP[apk]}-x86_64.apk || echo "no x64 apk"
|
cp ./build/app/outputs/flutter-apk/*x86_64*.apk out/${TARGET_NAME_apk}-x86_64.apk || echo "no x64 apk"
|
||||||
cp ./build/app/outputs/flutter-apk/app-release.apk out/${TARGET_MAP[apk]}-universal.apk || echo "no universal apk"
|
cp ./build/app/outputs/flutter-apk/app-release.apk out/${TARGET_NAME_apk}-universal.apk || echo "no universal apk"
|
||||||
|
|
||||||
- name: Copy to out Android AAB
|
- name: Copy to out Android AAB
|
||||||
if: matrix.platform == 'android-aab'
|
if: matrix.platform == 'android-aab'
|
||||||
env:
|
|
||||||
TARGET_MAP: ${{ env.TARGET_MAP }}
|
|
||||||
run: |
|
run: |
|
||||||
mkdir out
|
mkdir out
|
||||||
ls -R ./build/app/outputs
|
ls -R ./build/app/outputs
|
||||||
@@ -182,30 +176,29 @@ jobs:
|
|||||||
|
|
||||||
- name: Copy to out unix
|
- name: Copy to out unix
|
||||||
if: startsWith(matrix.platform,'linux') || matrix.platform == 'macos' || matrix.platform == 'ios'
|
if: startsWith(matrix.platform,'linux') || matrix.platform == 'macos' || matrix.platform == 'ios'
|
||||||
env:
|
|
||||||
TARGET_MAP: ${{ env.TARGET_MAP }}
|
|
||||||
run: |
|
run: |
|
||||||
ls -R dist/
|
ls -R dist/
|
||||||
mkdir out
|
mkdir out
|
||||||
mkdir tmp_out
|
mkdir tmp_out
|
||||||
|
|
||||||
for EXT in $(echo ${{ matrix.targets }} | tr ',' '\n'); do
|
for EXT in $(echo ${{ matrix.targets }} | tr ',' '\n'); do
|
||||||
targetFile=${TARGET_MAP[$EXT]}.$EXT
|
KEY=TARGET_NAME_${EXT}
|
||||||
mv dist/*/*.$EXT tmp_out/${targetFile}
|
FILENAME=${!KEY}
|
||||||
chmod +x tmp_out/${targetFile}
|
mv dist/*/*.$EXT tmp_out/${FILENAME}.$EXT
|
||||||
|
chmod +x tmp_out/${FILENAME}.$EXT
|
||||||
if [ "${{matrix.platform}}" == "linux" ];then
|
if [ "${{matrix.platform}}" == "linux" ];then
|
||||||
cp ./.github/help/linux/* tmp_out/
|
cp ./.github/help/linux/* tmp_out/
|
||||||
else
|
else
|
||||||
cp ./.github/help/mac-windows/* tmp_out/
|
cp ./.github/help/mac-windows/* tmp_out/
|
||||||
fi
|
fi
|
||||||
if [[ "${{matrix.platform}}" == 'ios' ]];then
|
if [[ "${{matrix.platform}}" == 'ios' ]];then
|
||||||
mv tmp_out/${targetFile} bin/${targetFile}
|
mv tmp_out/${FILENAME}.$EXT bin/${FILENAME}.$EXT
|
||||||
else
|
else
|
||||||
cd tmp_out
|
cd tmp_out
|
||||||
7z a ${TARGET_MAP[$EXT]}.zip ./
|
7z a ${FILENAME}.zip ./
|
||||||
mv *.zip ../out/
|
mv *.zip ../out/
|
||||||
if [[ $EXT == 'AppImage' ]];then
|
if [[ $EXT == 'AppImage' ]];then
|
||||||
mv ${targetFile} ../out/${targetFile} # added for appimage link
|
mv ${FILENAME}.$EXT ../out/${FILENAME}.$EXT # added for appimage link
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|||||||
14
Makefile
14
Makefile
@@ -1,14 +1,14 @@
|
|||||||
include dependencies.properties
|
include dependencies.properties
|
||||||
ifeq ($(OS),Windows_1NT)
|
MKDIR := mkdir -p
|
||||||
|
RM := rm -rf
|
||||||
|
SEP :=/
|
||||||
|
|
||||||
|
ifeq ($(OS),Windows_NT)
|
||||||
|
ifeq ($(IS_GITHUB_ACTIONS),)
|
||||||
MKDIR := -mkdir
|
MKDIR := -mkdir
|
||||||
RM := rmdir /s /q
|
RM := rmdir /s /q
|
||||||
SEP:=\\
|
SEP:=\\
|
||||||
PLATFORM_REQ:= @set /p platform="Run 'make prepare platform=ios' or enter platform name:";
|
endif
|
||||||
else
|
|
||||||
MKDIR := mkdir -p
|
|
||||||
RM := rm -rf
|
|
||||||
SEP :=/
|
|
||||||
PLATFORM_REQ:= @read -p "Run make prepare platform=ios or enter platform name: " platform;
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BINDIR=libcore$(SEP)bin
|
BINDIR=libcore$(SEP)bin
|
||||||
|
|||||||
Reference in New Issue
Block a user