Skip to content

Commit e656a1d

Browse files
committed
ci: use run-on-arch-action for amd64 Release and Debug build
1 parent 52c0a25 commit e656a1d

File tree

1 file changed

+29
-21
lines changed

1 file changed

+29
-21
lines changed

.github/workflows/ci_linux.yml

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
m:
1111
- { os: ubuntu-24.04-arm, configuration: Release, arch: armv7 }
1212
- { os: ubuntu-24.04-arm, configuration: Release, arch: aarch64 }
13-
# - { os: ubuntu-24.04, configuration: Release, arch: amd64 }
14-
# - { os: ubuntu-24.04, configuration: Debug, arch: amd64 }
13+
- { os: ubuntu-24.04, configuration: Release, arch: amd64 }
14+
- { os: ubuntu-24.04, configuration: Debug, arch: amd64 }
1515
runs-on: ${{matrix.m.os}}
1616
name: 'Linux ${{matrix.m.configuration}} ${{matrix.m.arch}}'
1717
steps:
@@ -23,26 +23,34 @@ jobs:
2323
id: date
2424
run: echo "date=$(date +'%Y-%m-%d_%H-%M')" >> $GITHUB_OUTPUT
2525

26-
- name: amd64 | Install libs
26+
- name: amd64 | Install libs and build with dpkg-buildpackage for Release or ninja for Debug
2727
if: matrix.m.arch == 'amd64'
28-
run: |
29-
sudo apt-get update
30-
sudo apt-get install cmake ninja-build qtbase5-dev qttools5-dev libqscintilla2-qt5-dev libqtermwidget5-1-dev libutf8proc-dev
31-
32-
- name: Debug amd64 | Configure with cmake
33-
if: matrix.m.configuration == 'Debug' && matrix.m.arch == 'amd64'
34-
run: mkdir build && cd build && cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.m.configuration}}
35-
36-
- name: Debug | Build with cmake
37-
if: matrix.m.configuration == 'Debug'
38-
run: ninja
39-
working-directory: build
40-
41-
- name: Release amd64 | Build deb packages with debuild
42-
if: matrix.m.configuration == 'Release' && matrix.m.arch == 'amd64'
43-
run: |
44-
sudo apt-get install devscripts debhelper libenca-dev build-essential
45-
debuild -b -uc -us
28+
uses: uraimo/run-on-arch-action@v3
29+
with:
30+
arch: none
31+
distro: none
32+
base_image: --platform=linux/amd64 amd64/ubuntu:25.04
33+
# GitHub token used for caching Docker images in project's public package registry
34+
githubToken: ${{github.token}}
35+
# Mount the juffed directory as /artifacts in the container
36+
dockerRunArgs: |
37+
--volume "/home/runner/work/juffed/juffed:/artifacts"
38+
# Install dependencies in the container. They will be cached
39+
install: |
40+
export DEBIAN_FRONTEND=noninteractive
41+
apt-get update -q -y
42+
apt-get install -q -y gcc g++ cmake ninja-build qt6-5compat-dev qt6-tools-dev qt6-tools-dev-tools libqscintilla2-qt6-dev libqtermwidget6-2-dev libutf8proc-dev
43+
# Install debuild dependencies
44+
apt-get install -q -y pkg-config devscripts debhelper libenca-dev
45+
run: |
46+
cmake --version
47+
if [ "${{matrix.m.configuration}}" == "Release" ]; then
48+
debuild -b -uc -us
49+
fi
50+
if [ "${{matrix.m.configuration}}" == "Debug" ]; then
51+
echo "Debug"
52+
fi
53+
cp ../*.deb /artifacts
4654
4755
- name: armv7, aarch64 | Install libs and build with dpkg-buildpackage
4856
if: matrix.m.arch == 'armv7' || matrix.m.arch == 'aarch64'

0 commit comments

Comments
 (0)