Skip to content

Commit a1b7bb8

Browse files
Merge pull request #128 from vigri/fix/ci-ubuntu-noble
fix(ci): update apt dependencies for Ubuntu 24.04 (Noble) & AppImage
2 parents cd626ef + 50f9c6b commit a1b7bb8

2 files changed

Lines changed: 25 additions & 9 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,53 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v5
22-
22+
2323
- name: Install dependencies
24-
run: sudo apt install gcc g++ cmake libjpeg-dev libpng-dev libtiff5 libtiff5-dev libboost-test-dev qtbase5-dev libqt5svg5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev libpthread-stubs0-dev rpm libfuse2
24+
run: |
25+
sudo apt-get update
26+
sudo apt-get install -y --fix-missing \
27+
gcc g++ cmake \
28+
libjpeg-dev libpng-dev \
29+
libtiff6 libtiff5-dev \
30+
libboost-test-dev \
31+
qtbase5-dev libqt5svg5-dev \
32+
qttools5-dev qttools5-dev-tools \
33+
libqt5opengl5-dev \
34+
libpthread-stubs0-dev \
35+
rpm libfuse2t64
2536
2637
- name: Configure CMake
2738
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
2839
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
29-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
40+
run: cmake -B "${{ github.workspace }}/build" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
3041

3142
- name: Build
3243
# Build your program with the given configuration
33-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
44+
run: cmake --build "${{ github.workspace }}/build" --config ${{env.BUILD_TYPE}}
3445

3546
- name: Create DEB package
36-
working-directory: ${{github.workspace}}/build
47+
working-directory: "${{ github.workspace }}/build"
3748
run: |
3849
cpack -G "DEB"
3950
mv scantailor*.deb scantailor.deb
4051
4152
- name: Create RPM package
42-
working-directory: ${{github.workspace}}/build
53+
working-directory: "${{ github.workspace }}/build"
4354
run: |
4455
cpack -G "RPM"
4556
mv scantailor*.rpm scantailor.rpm
4657
4758
- name: Create AppImage package
48-
working-directory: ${{github.workspace}}/build
59+
working-directory: "${{ github.workspace }}/build"
4960
run: |
5061
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
5162
chmod +x linuxdeploy-x86_64.AppImage
52-
./linuxdeploy-x86_64.AppImage --appdir AppDir --desktop-file ../src/resources/unix/scantailor.desktop --icon-file ../src/resources/ScanTailor.png --executable scantailor --output appimage
63+
./linuxdeploy-x86_64.AppImage \
64+
--appdir AppDir \
65+
--desktop-file "${{ github.workspace }}/build/scantailor.desktop" \
66+
--icon-file "${{ github.workspace }}/src/resources/ScanTailor.png" \
67+
--executable scantailor \
68+
--output appimage
5369
mv ScanTailor*.AppImage scantailor.AppImage
5470
5571
- name: Upload Linux bin

src/resources/unix/scantailor.desktop.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[Desktop Entry]
2-
Version=@VERSION@
2+
Version=1.0
33
Name=ScanTailor Advanced
44
Comment=Interactive post-processing tool for scanned pages
55
Exec=scantailor %f

0 commit comments

Comments
 (0)