Skip to content

Commit ade69b8

Browse files
KangLinKangLin
committed
Script: modify build_linux.sh with CI
1 parent dc690cf commit ade69b8

4 files changed

Lines changed: 31 additions & 24 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,11 @@ jobs:
214214
echo "" >> ${{github.workspace}}/Release.md
215215
echo "| | x86-64 (64-bit) | x86-32 (32-bit) | AArch64 (ARM64) | ARMv7 (32-bit) |:us: Comment|:cn: 备注|" >> ${{github.workspace}}/Release.md
216216
echo "|:- | :-------------- | :-------------- | :-------------- | :------------- |:------|---|" >> ${{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)|支持平台：[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
217+
echo "|Windows|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.10.2_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)|支持平台：[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
220220
221-
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.|解压 zip 文件，然后执行 \`install.sh\` 安装用于图形界面的目录、桌面快捷方式。或者在终端中执行 \`RabbitRemoteControl*.AppImage\` 文件。|" >> ${{github.workspace}}/Release.md
221+
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.|解压 zip 文件，然后执行 \`install.sh\`， 安装用于图形界面的目录、桌面快捷方式；或者在终端中执行 \`RabbitRemoteControl*.AppImage\` 文件，运行程序。|" >> ${{github.workspace}}/Release.md
222222
223223
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. Run \`sudo apt install ./rabbitremotecontrol_*.deb\` to install it.|因为系统库版本太低，所以一些功能受限。运行命令 \`sudo apt install ./rabbitremotecontrol_*.deb\` 进行安装。 |" >> ${{github.workspace}}/Release.md
224224
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)| | Run \`sudo apt install ./rabbitremotecontrol_*.deb\` to install it. | 运行命令 \`sudo apt install ./rabbitremotecontrol_*.deb\` 进行安装。 |" >> ${{github.workspace}}/Release.md
@@ -230,13 +230,6 @@ jobs:
230230
RPM_VERSION=${RabbitRemoteControl_VERSION//-/\_}
231231
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)| |Run \`sudo dnf install \"rpm file\"\` to install it. |执行命令 \`sudo dnf install \"rpm file\"\` 进行安装。 |" >> ${{github.workspace}}/Release.md
232232
233-
- name: Add download in test
234-
if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
235-
run: |
236-
export BRANCH_NAME=${{ github.ref_name }}
237-
if [ "${{ github.ref_name }}" == "master" ]; then
238-
export BRANCH_NAME=test_${{ github.ref_name }}
239-
fi
240233
echo "|Flatpak|[flatpak](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64.flatpak)| |[flatpak](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64.flatpak)| |Run \`flatpak install \"flatpak File\" [--user]\` to install it.|执行命令 \`flatpak install \"flatpak File\" [--user]\` 进行安装。|" >> ${{github.workspace}}/Release.md
241234
242235
- name: Add snap donwload in Release.md file

‎.github/workflows/docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
uses: actions/checkout@v4
9595
with:
9696
submodules: true
97-
fetch-depth: 0
97+
#fetch-depth: 0
9898

9999
- name: Make directories
100100
run: |

‎.github/workflows/linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: actions/checkout@v3
5151
with:
5252
submodules: recursive
53-
fetch-depth: 0
53+
#fetch-depth: 0
5454

5555
- name: Make directories
5656
run: |

‎Script/build_linux.sh‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -350,36 +350,50 @@ if [ $DOCKER -eq 1 ]; then
350350
DOCKER_PARA="-e DEBIAN_FRONTEND=noninteractive -e TZ=UTC"
351351
fi
352352
docker run --privileged ${DOCKER_PARA} \
353-
--volume ${BUILD_LINUX_DIR}:/home/build \
354-
--volume ${INSTALL_DIR}:/home/install \
355-
--volume ${TOOLS_DIR}:/home/tools \
356-
--interactive --rm ${DOCKER_IMAGE} \
353+
-e CI=${CI} \
354+
--volume ${REPO_ROOT}:/home/RabbitRemoteControl \
355+
--volume ${BUILD_LINUX_DIR}:/home/build \
356+
--volume ${INSTALL_DIR}:/home/install \
357+
--volume ${TOOLS_DIR}:/home/tools \
358+
--interactive --rm ${DOCKER_IMAGE} \
357359
bash -e -x -c "
358-
tar -C ~ -xf /home/build/RabbitRemoteControl.tar.gz
359-
~/RabbitRemoteControl/Script/build_linux.sh --deb --install=/home/install --tools=/home/tools --verbose=${BUILD_VERBOSE}
360-
cp ~/rabbitremotecontrol*.deb /home/build/
360+
if [ ! \$CI ]; then
361+
tar -C ~ -xf /home/build/RabbitRemoteControl.tar.gz
362+
export SOURCE_CODE_DIR=~
363+
else
364+
export SOURCE_CODE_DIR=/home
365+
fi
366+
\${SOURCE_CODE_DIR}/RabbitRemoteControl/Script/build_linux.sh --deb --install=/home/install --tools=/home/tools --verbose=${BUILD_VERBOSE}
367+
cp \${SOURCE_CODE_DIR}/rabbitremotecontrol*.deb /home/build/
361368
"
362369
fi
363370
if [ $APPIMAGE -eq 1 ]; then
364371
if [[ "$DOCKER_IMAGE" =~ ^(ubuntu|debian) ]]; then
365372
DOCKER_PARA="-e DEBIAN_FRONTEND=noninteractive -e TZ=UTC"
366373
fi
367374
docker run --privileged ${DOCKER_PARA} \
375+
-e CI=${CI} \
376+
--volume ${REPO_ROOT}:/home/RabbitRemoteControl \
368377
--volume ${BUILD_LINUX_DIR}:/home/build \
369378
--volume ${INSTALL_DIR}:/home/install \
370379
--volume ${TOOLS_DIR}:/home/tools \
371380
--interactive --rm ${DOCKER_IMAGE} \
372381
bash -e -x -c "
373-
tar -C ~ -xf /home/build/RabbitRemoteControl.tar.gz
374-
~/RabbitRemoteControl/Script/build_linux.sh --appimage --install=/home/install --tools=/home/tools --verbose=${BUILD_VERBOSE}
382+
if [ ! \$CI ]; then
383+
tar -C ~ -xf /home/build/RabbitRemoteControl.tar.gz
384+
export SOURCE_CODE_DIR=~
385+
else
386+
export SOURCE_CODE_DIR=/home
387+
fi
388+
\${SOURCE_CODE_DIR}/RabbitRemoteControl/Script/build_linux.sh --appimage --install=/home/install --tools=/home/tools --verbose=${BUILD_VERBOSE}
375389
# Create install script
376390
mkdir -p /home/build/install
377391
pushd /home/build/install
378-
cp ~/RabbitRemoteControl/RabbitRemoteControl_`uname -m`.AppImage .
392+
cp \${SOURCE_CODE_DIR}/RabbitRemoteControl/RabbitRemoteControl_`uname -m`.AppImage .
379393
chmod a+rx RabbitRemoteControl_`uname -m`.AppImage
380-
cp ~/RabbitRemoteControl/build_appimage/AppDir/usr/share/applications/io.github.KangLin.RabbitRemoteControl.desktop .
381-
cp ~/RabbitRemoteControl/build_appimage/AppDir/usr/share/icons/hicolor/scalable/apps/io.github.KangLin.RabbitRemoteControl.svg .
382-
cp ~/RabbitRemoteControl/Script/install_appimage.sh install.sh
394+
cp \${SOURCE_CODE_DIR}/RabbitRemoteControl/build_appimage/AppDir/usr/share/applications/io.github.KangLin.RabbitRemoteControl.desktop .
395+
cp \${SOURCE_CODE_DIR}/RabbitRemoteControl/build_appimage/AppDir/usr/share/icons/hicolor/scalable/apps/io.github.KangLin.RabbitRemoteControl.svg .
396+
cp \${SOURCE_CODE_DIR}/RabbitRemoteControl/Script/install_appimage.sh install.sh
383397
chmod a+rx install.sh
384398
popd
385399
"

0 commit comments

Comments
 (0)