fix build

This commit is contained in:
Hiddify
2023-10-08 08:47:56 +02:00
parent c59c9a976d
commit b225ff16c7

View File

@@ -37,16 +37,19 @@ jobs:
os: windows-latest os: windows-latest
aarch: amd64 aarch: amd64
targets: exe targets: exe
filename: hiddify-windows-x64
- platform: linux - platform: linux
os: ubuntu-latest os: ubuntu-latest
aarch: amd64 aarch: amd64
targets: AppImage targets: AppImage
filename: hiddify-linux-x64
- platform: macos - platform: macos
os: macos-13 os: macos-13
aarch: universal aarch: universal
targets: dmg targets: dmg
filename: hiddify-macos-universal
# - platform: ios # - platform: ios
# os: macos-11 # os: macos-11
@@ -190,24 +193,43 @@ jobs:
- name: Copy to out unix - name: Copy to out unix
if: matrix.platform == 'linux' || matrix.platform == 'macos' || matrix.platform == 'ios' if: matrix.platform == 'linux' || matrix.platform == 'macos' || matrix.platform == 'ios'
run: | run: |
ls -R ls -R dist/
mkdir out mkdir out
mkdir tmp_out mkdir tmp_out
IFS=',' read -r -a EXT_ARRAY <<< "${{ matrix.targets }}" EXT="${{ matrix.targets }}"
# Loop over extensions mv dist/*/*.$EXT tmp_out/${{matrix.filename}}.$EXT
for EXT in "${EXT_ARRAY[@]}"; do chmod +x tmp_out/${{matrix.filename}}.$EXT
# Find all files with this extension in SRC_DIR, and copy them to DST_DIR if [ "${{matrix.platform}}" == "linux" ];then
find "." -type f -name "*.$EXT" -exec cp {} "tmp_out" \; cp ./.github/help/linux/* tmp_out/
done else
cp ./.github/help/mac-windows/* tmp_out/
fi
cd tmp_out
7z a ${{matrix.filename}}.zip ./
mv *.zip ../out/
mv tmp_out/*.AppImage tmp_out/hiddify-linux-x64.AppImage &&\ # - name: Copy to out unix
chmod +x tmp_out/hiddify-linux-x64.AppImage &&\ # if: matrix.platform == 'linux' || matrix.platform == 'macos' || matrix.platform == 'ios'
cp ./.github/help/linux/* tmp_out/ \ # run: |
||echo "no app image" # ls -R dist/
mv tmp_out/*.dmg tmp_out/hiddify-macos-universal.dmg && \ # mkdir out
cp ./.github/help/mac-windows/* tmp_out/ \ # mkdir tmp_out
|| echo "no macos dmg" # IFS=',' read -r -a EXT_ARRAY <<< "${{ matrix.targets }}"
cd tmp_out && 7z a hiddify-${{matrix.platform}}-x64.zip ./ && mv *.zip ../out/s # # Loop over extensions
# for EXT in "${EXT_ARRAY[@]}"; do
# # Find all files with this extension in SRC_DIR, and copy them to DST_DIR
# find "." -type f -name "*.$EXT" -exec cp {} "tmp_out" \;
# done
# mv tmp_out/*.AppImage tmp_out/hiddify-linux-x64.AppImage &&\
# chmod +x tmp_out/hiddify-linux-x64.AppImage &&\
# cp ./.github/help/linux/* tmp_out/ \
# ||echo "no app image"
# mv tmp_out/*.dmg tmp_out/hiddify-macos-universal.dmg && \
# cp ./.github/help/mac-windows/* tmp_out/ \
# || echo "no macos dmg"
# cd tmp_out && 7z a hiddify-${{matrix.platform}}-x64.zip ./ && mv *.zip ../out/
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3