Skip to content

Commit d60b42f

Browse files
KangLinKangLin
committed
Script: modify script
1 parent b68424e commit d60b42f

29 files changed

+896
-446
lines changed

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,21 @@ jobs:
213213
echo "" >> ${{github.workspace}}/Release.md
214214
echo "| | x86-64 (64-bit) | x86-32 (32-bit) | AArch64 (ARM64) | ARMv7 (32-bit) |Remark|" >> ${{github.workspace}}/Release.md
215215
echo "|:- | :-------------- | :-------------- | :-------------- | :------------- |:-----|" >> ${{github.workspace}}/Release.md
216-
#echo "|Windows 7 SP1 or later|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.9.3_Setup.exe) [Portable](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.9.3_Portable.zip)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Setup.exe) [Portable](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Portable.zip)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_arm64_qt6.9.3_Setup.exe) [Portable](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_arm64_qt6.9.3_Portable.zip) | |Unzip the portable zip file and execute \`bin/RabbitRemoteControl.exe\` to run the program. If this is the first run, execute \`npcap-1.80.exe\` to install npcap driver. the wake on lan depends on it.|" >> ${{github.workspace}}/Release.md
217-
echo "|Windows 7 SP1 or later|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.9.3_Setup.exe)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Setup.exe)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_arm64_qt6.9.3_Setup.exe)| |Include portable functionality. You can run the program directly without installing it.|" >> ${{github.workspace}}/Release.md
216+
#echo "|Windows|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.9.3_Setup.exe) [Portable](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.9.3_Portable.zip)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Setup.exe) [Portable](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Portable.zip)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_arm64_qt6.9.3_Setup.exe) [Portable](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_arm64_qt6.9.3_Portable.zip) | |Unzip the portable zip file and execute \`bin/RabbitRemoteControl.exe\` to run the program. If this is the first run, execute \`npcap-1.80.exe\` to install npcap driver. the wake on lan depends on it.|" >> ${{github.workspace}}/Release.md
217+
echo "|Windows|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.9.3_Setup.exe)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Setup.exe)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_arm64_qt6.9.3_Setup.exe)| |Supported platforms: [x86-32(Qt5)](https://doc.qt.io/qt-5/supported-platforms.html) [x86-64(Qt6)](https://doc.qt.io/qt-6/supported-platforms.html)|" >> ${{github.workspace}}/Release.md
218218
echo "|Android|[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_x86_64_qt6.9.3_Release.apk) | |[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_arm64_v8a_qt6.9.3_Release.apk)| |Experiment|" >> ${{github.workspace}}/Release.md
219219
echo "|Macos|[App zip](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-15-intel.zip) [dmg](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-15-intel.dmg)||[App zip](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-14.zip) [dmg](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-14.dmg)||Experiment|" >> ${{github.workspace}}/Release.md
220+
220221
#echo "|Linux|[AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64.AppImage) [Setup zip file](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64_Setup.zip)| |[AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64.AppImage) [Setup zip file](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64_Setup.zip)| |sudo chmod u+x RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64.AppImage|" >> ${{github.workspace}}/Release.md
221222
echo "|Linux|[zip file of install AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64_Setup.zip)| |[zip file of install AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64_Setup.zip)| |Unzip the zip file, then execute \`install.sh\` to install shortcuts for application, links, and directories in graphical user interfaces (GUIs), or execute \`./RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64.AppImage\` to run program in the terminal.|" >> ${{github.workspace}}/Release.md
223+
222224
echo "|Ubuntu 24.04|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu-24.04_amd64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu-24.04-arm_arm64.deb)| |Because the system library version is too low, some functions are limited.|" >> ${{github.workspace}}/Release.md
225+
echo "|Ubuntu 25.04|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu25.04_x86_64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu25.04_aarch64.deb)| | |" >> ${{github.workspace}}/Release.md
226+
echo "|Ubuntu 26.04|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu26.04_x86_64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu26.04_aarch64.deb)| | |" >> ${{github.workspace}}/Release.md
227+
228+
echo "|Debian 12|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_debian12_x86_64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_debian12_aarch64.deb)| |Because the system library version is too low, some functions are limited.|" >> ${{github.workspace}}/Release.md
229+
echo "|Debian 13|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_debian13_x86_64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_debian13_aarch64.deb)| | |" >> ${{github.workspace}}/Release.md
230+
223231
RPM_VERSION=${RabbitRemoteControl_VERSION//-/\~}
224232
echo "|Fedora 41|[RPM](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol-${RPM_VERSION}-1.fc41.x86_64.rpm)| |[RPM](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol-${RPM_VERSION}-1.fc41.aarch64.rpm)| |sudo dnf install \"rpm file\" |" >> ${{github.workspace}}/Release.md
225233

‎.github/workflows/docker.yml‎

Lines changed: 58 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,56 @@ jobs:
1919
variant:
2020
- PACKAGE: deb
2121
image: ubuntu
22-
lable: ":25.04"
22+
lable: "25.04"
2323
os: ubuntu-24.04
2424
- PACKAGE: deb
2525
image: ubuntu
26-
lable: ":25.04"
26+
lable: "25.04"
27+
os: ubuntu-24.04-arm
28+
- PACKAGE: deb
29+
image: ubuntu
30+
lable: "26.04"
31+
os: ubuntu-24.04
32+
- PACKAGE: deb
33+
image: ubuntu
34+
lable: "26.04"
35+
os: ubuntu-24.04-arm
36+
37+
- PACKAGE: deb
38+
image: debian
39+
lable: "12"
40+
os: ubuntu-24.04
41+
- PACKAGE: deb
42+
image: debian
43+
lable: "12"
44+
os: ubuntu-24.04-arm
45+
- PACKAGE: deb
46+
image: debian
47+
lable: "13"
48+
os: ubuntu-24.04
49+
- PACKAGE: deb
50+
image: debian
51+
lable: "13"
2752
os: ubuntu-24.04-arm
2853

2954
- PACKAGE: appimage
3055
image: ubuntu
31-
lable: ":25.04"
56+
lable: "25.04"
3257
os: ubuntu-24.04
33-
BUILD_VERBOSE: ON
58+
BUILD_VERBOSE: OFF
3459
- PACKAGE: appimage
3560
image: ubuntu
36-
lable: ":25.04"
61+
lable: "25.04"
3762
os: ubuntu-24.04-arm
38-
BUILD_VERBOSE: ON
63+
BUILD_VERBOSE: OFF
3964

4065
- PACKAGE: rpm
4166
image: fedora
42-
lable: ":41"
67+
lable: "41"
4368
os: ubuntu-24.04
4469
- PACKAGE: rpm
4570
image: fedora
46-
lable: ":41"
71+
lable: "41"
4772
os: ubuntu-24.04-arm
4873

4974
# See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
@@ -90,7 +115,24 @@ jobs:
90115

91116
- name: run docker
92117
run: |
93-
./Script/build_linux.sh --docker --docker-image="${{matrix.variant.image}}${{matrix.variant.lable}}" --${{matrix.variant.PACKAGE}}
118+
if [ -n "${{matrix.variant.lable}}" ]; then
119+
docker_image="${{matrix.variant.image}}:${{matrix.variant.lable}}"
120+
else
121+
docker_image="${{matrix.variant.image}}"
122+
fi
123+
./Script/build_linux.sh --docker --docker-image="${docker_image}" --${{matrix.variant.PACKAGE}}
124+
125+
- name: Rename deb file
126+
if: ${{ matrix.variant.PACKAGE == 'deb' }}
127+
#continue-on-error: true
128+
run: |
129+
cd ${{env.BUILD_DIR}}/build_linux
130+
if [ -n "${{matrix.variant.lable}}" ]; then
131+
docker_image="${{matrix.variant.image}}${{matrix.variant.lable}}"
132+
else
133+
docker_image="${{matrix.variant.image}}"
134+
fi
135+
mv rabbitremotecontrol_*.deb rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_${docker_image}_`uname -m`.deb
94136
95137
- name: AppIagme update configure file
96138
if: ${{ matrix.variant.PACKAGE == 'appimage' }}
@@ -104,10 +146,10 @@ jobs:
104146
sleep 1
105147
export DISPLAY=:91.0
106148
ARCH=`uname -m`
107-
pushd ${{github.workspace}}/build_linux/install
149+
pushd ${{env.BUILD_DIR}}/build_linux/install
108150
sudo mv -f RabbitRemoteControl_${ARCH}.AppImage RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_${ARCH}.AppImage
109151
popd
110-
pushd ${{github.workspace}}/build_linux
152+
pushd ${{env.BUILD_DIR}}/build_linux
111153
mv install RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_${ARCH}_Setup
112154
zip RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_${ARCH}_Setup.zip RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_${ARCH}_Setup/*
113155
@@ -129,9 +171,9 @@ jobs:
129171
#if: ${{matrix.variant.PACKAGE != 'deb'}}
130172
uses: actions/upload-artifact@v4
131173
with:
132-
name: ${{ env.artifact_name }}_${{matrix.variant.PACKAGE}}_${{matrix.variant.image}}_${{matrix.variant.os}}
174+
name: ${{ env.artifact_name }}_${{matrix.variant.PACKAGE}}_${{matrix.variant.image}}_${{matrix.variant.lable}}_${{matrix.variant.os}}
133175
path: |
134-
${{github.workspace}}/build_linux/rabbitremotecontrol*.rpm
135-
${{github.workspace}}/build_linux/rabbitremotecontrol_*.deb
136-
${{github.workspace}}/build_linux/RabbitRemoteControl_*_Setup.zip
137-
${{github.workspace}}/build_linux/update_appimage_*.json
176+
${{env.BUILD_DIR}}/build_linux/rabbitremotecontrol*.rpm
177+
${{env.BUILD_DIR}}/build_linux/rabbitremotecontrol_*.deb
178+
${{env.BUILD_DIR}}/build_linux/RabbitRemoteControl_*_Setup.zip
179+
${{env.BUILD_DIR}}/build_linux/update_appimage_*.json

‎.github/workflows/flatpak.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
# See: [Choosing the runner for a job](https://docs.github.com/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job)
2727
# See: https://github.com/actions/runner-images/
2828
runs-on: ${{ matrix.variant.os }}
29+
2930
container:
3031
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-44
3132
options: --privileged

‎.github/workflows/linux.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
BUILD_DIR: ${{github.workspace}}/build
3737
SOURCE_DIR: ${{github.workspace}}/.cache/source
3838
TOOLS_DIR: ${{github.workspace}}/.cache/tools
39-
INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.os}}_${{matrix.BUILD_TYPE}}_${{matrix.PACKAGE}}
40-
BUILD_VERBOSE: OFF
39+
INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.os}}_${{matrix.BUILD_TYPE}}
40+
BUILD_VERBOSE: ON
4141
RabbitRemoteControl_VERSION: 0.0.36
4242
artifact_name: build_linux
4343

@@ -67,7 +67,7 @@ jobs:
6767
${{env.INSTALL_DIR}}
6868
${{env.TOOLS_DIR}}/linuxdeploy-*
6969
${{env.TOOLS_DIR}}/qt_*
70-
key: install_linux
70+
key: install_linux_${{matrix.os}}
7171

7272
- name: build linux
7373
#continue-on-error: true

‎.github/workflows/macos.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
BUILD_DIR: ${{github.workspace}}/build
5151
SOURCE_DIR: ${{github.workspace}}/.cache/source
5252
TOOLS_DIR: ${{github.workspace}}/.cache/tools
53-
INSTALL_DIR: ${{github.workspace}}/.cache/install
53+
INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.os}}
5454
qt_modules: "qtscxml qtmultimedia qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine"
5555
VCPKGGITCOMMITID: 7213cf8135c329c37c7e2778e40774489a0583a8
5656
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
@@ -219,7 +219,7 @@ jobs:
219219
working-directory: ${{env.SOURCE_DIR}}
220220
run: |
221221
if [ ! -d ${{ env.INSTALL_DIR }}/share/cmake/lxqt2-build-tools ]; then
222-
git clone -b 2.2.0 --depth=1 https://github.com/lxqt/lxqt-build-tools.git
222+
git clone -b 2.3.0 --depth=1 https://github.com/lxqt/lxqt-build-tools.git
223223
cd lxqt-build-tools
224224
cmake -E make_directory build
225225
cd build
@@ -366,7 +366,7 @@ jobs:
366366
-DWITH_CMARK_GFM=ON \
367367
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
368368
-DCMAKE_BUILD_TYPE=Release \
369-
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build/RabbitRemoteControl.App/Contents \
369+
-DCMAKE_INSTALL_PREFIX=${{env.BUILD_DIR}}/RabbitRemoteControl.App/Contents \
370370
-DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}}/lib/cmake \
371371
-DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" \
372372
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
@@ -407,7 +407,6 @@ jobs:
407407
#otool -L RabbitRemoteControl.App/Contents/FrameWorks/QtGui.framework/QtGui
408408
409409
fi
410-
411410
- name: Update configure file
412411
if: ${{ !matrix.WITH_MACOSX_BUNDLE }}
413412
working-directory: ${{github.workspace}}/build

0 commit comments

Comments
 (0)