update, Qt6: updated Qt6 CI configurations, !APK !QT5 !DEB !NSIS

This commit is contained in:
QxQ 2020-12-13 19:33:44 +08:00
parent 969e4423ce
commit 6b9be09384
2 changed files with 19 additions and 17 deletions

View File

@ -168,23 +168,25 @@ jobs:
if: matrix.platform == 'ubuntu-20.04' if: matrix.platform == 'ubuntu-20.04'
run: | run: |
cd build cd build
wget https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage
chmod +x ./linuxdeployqt-6-x86_64.AppImage
cd AppDir cd AppDir
wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/AppRun-patched-x86_64 -O AppRun
chmod a+x AppRun
mkdir -p ./usr/{lib,optional}/ mkdir -p ./usr/{lib,optional}/
wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so -O ./usr/optional/exec.so
mkdir -p ./usr/optional/libstdc++/ mkdir -p ./usr/optional/libstdc++/
cp -fv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./usr/optional/libstdc++/
mkdir -p ./usr/optional/libgcc_s/ mkdir -p ./usr/optional/libgcc_s/
wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/AppRun-patched-x86_64 -O AppRun
wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so -O ./usr/optional/exec.so
chmod a+x AppRun
cp -fv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./usr/optional/libstdc++/
cp -fv /lib/x86_64-linux-gnu/libgcc_s.so.1 ./usr/optional/libgcc_s/ cp -fv /lib/x86_64-linux-gnu/libgcc_s.so.1 ./usr/optional/libgcc_s/
cp -fv /usr/lib/x86_64-linux-gnu/{libssl.so.1.1,libcrypto.so.1.1} ./usr/lib/ cp -fv /usr/lib/x86_64-linux-gnu/{libssl.so.1.1,libcrypto.so.1.1} ./usr/lib/
mkdir -p ./usr/plugins/platforminputcontexts/
cp -fv /usr/lib/x86_64-linux-gnu/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so ./usr/plugins/platforminputcontexts/
wget https://github.com/Qv2ray/qt-pkg/releases/download/bruh/libfcitx5platforminputcontextplugin.so -O ./usr/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so
cd .. cd ..
./linuxdeployqt-6-x86_64.AppImage AppDir/usr/share/applications/qv2ray.desktop -unsupported-allow-new-glibc -appimage -no-strip -always-overwrite -extra-plugins=iconengines,imageformats,platforminputcontexts wget https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage
chmod +x ./linuxdeployqt-6-x86_64.AppImage
./linuxdeployqt-6-x86_64.AppImage AppDir/usr/share/applications/qv2ray.desktop \
-unsupported-allow-new-glibc \
-appimage \
-no-strip \
-always-overwrite \
-extra-plugins=iconengines,imageformats,platforminputcontexts
mv ./Qv2ray*.AppImage ./Qv2ray.AppImage mv ./Qv2ray*.AppImage ./Qv2ray.AppImage
- name: Linux - ${{ matrix.qt_version }} - Uploading Artifact - name: Linux - ${{ matrix.qt_version }} - Uploading Artifact
if: matrix.platform == 'ubuntu-20.04' if: matrix.platform == 'ubuntu-20.04'
@ -194,11 +196,11 @@ jobs:
path: build/Qv2ray.AppImage path: build/Qv2ray.AppImage
- name: Linux - ${{ matrix.qt_version }} - Upload binaries to release - name: Linux - ${{ matrix.qt_version }} - Upload binaries to release
uses: svenstaro/upload-release-action@v1-release uses: svenstaro/upload-release-action@v1-release
if: github.event_name == 'release' && matrix.platform == 'ubuntu-20.04' && matrix.ui_type == 'QWidget' && matrix.qt_version == '5.15.0' && matrix.build_type == 'Release' if: github.event_name == 'release' && matrix.platform == 'ubuntu-20.04' && matrix.ui_type == 'QWidget' && matrix.qt_version == '6.0.0' && matrix.build_type == 'Release'
with: with:
repo_token: ${{ secrets.GITHUB_TOKEN }} repo_token: ${{ secrets.GITHUB_TOKEN }}
file: build/Qv2ray.AppImage file: build/Qv2ray.AppImage
asset_name: Qv2ray.${{ steps.get_version.outputs.VERSION }}.linux.AppImage asset_name: Qv2ray.${{ steps.get_version.outputs.VERSION }}.Qt6.Linux.AppImage
tag: ${{ github.ref }} tag: ${{ github.ref }}
overwrite: true overwrite: true
# -------------------------------------------------------- # --------------------------------------------------------
@ -210,11 +212,11 @@ jobs:
path: Qv2ray.dmg path: Qv2ray.dmg
- name: macOS - ${{ matrix.qt_version }} - Upload binaries to release - name: macOS - ${{ matrix.qt_version }} - Upload binaries to release
uses: svenstaro/upload-release-action@v1-release uses: svenstaro/upload-release-action@v1-release
if: github.event_name == 'release' && matrix.platform == 'macos-latest' && matrix.ui_type == 'QWidget' && matrix.qt_version == '5.15.0' && matrix.build_type == 'Release' if: github.event_name == 'release' && matrix.platform == 'macos-latest' && matrix.ui_type == 'QWidget' && matrix.qt_version == '6.0.0' && matrix.build_type == 'Release'
with: with:
repo_token: ${{ secrets.GITHUB_TOKEN }} repo_token: ${{ secrets.GITHUB_TOKEN }}
file: Qv2ray.dmg file: Qv2ray.dmg
asset_name: Qv2ray.${{ steps.get_version.outputs.VERSION }}.macOS.dmg asset_name: Qv2ray.${{ steps.get_version.outputs.VERSION }}.Qt6.macOS.dmg
tag: ${{ github.ref }} tag: ${{ github.ref }}
overwrite: true overwrite: true
# -------------------------------------------------------- # --------------------------------------------------------
@ -232,10 +234,10 @@ jobs:
path: release.7z path: release.7z
- name: Win - ${{ matrix.qt_version }} - Upload binaries to release - name: Win - ${{ matrix.qt_version }} - Upload binaries to release
uses: svenstaro/upload-release-action@v1-release uses: svenstaro/upload-release-action@v1-release
if: github.event_name == 'release' && matrix.platform == 'windows-latest' && matrix.ui_type == 'QWidget' && matrix.qt_version == '5.15.0' && matrix.build_type == 'Release' if: github.event_name == 'release' && matrix.platform == 'windows-latest' && matrix.ui_type == 'QWidget' && matrix.qt_version == '6.0.0' && matrix.build_type == 'Release'
with: with:
repo_token: ${{ secrets.GITHUB_TOKEN }} repo_token: ${{ secrets.GITHUB_TOKEN }}
file: release.7z file: release.7z
asset_name: Qv2ray.${{ steps.get_version.outputs.VERSION }}.Windows.7z asset_name: Qv2ray.${{ steps.get_version.outputs.VERSION }}.Qt6.Windows.7z
tag: ${{ github.ref }} tag: ${{ github.ref }}
overwrite: true overwrite: true

View File

@ -1 +1 @@
6088 6089