Skip to content

Commit 4adb371

Browse files
committed
ci: remove disabled steps for i386 build
1 parent afab372 commit 4adb371

1 file changed

Lines changed: 0 additions & 40 deletions

File tree

.github/workflows/ci_linux.yml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ 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-20.04, configuration: Release, arch: i386 }
1413
- { os: ubuntu-24.04, configuration: Release, arch: amd64 }
15-
# - { os: ubuntu-20.04, configuration: Debug, arch: i386 }
1614
- { os: ubuntu-24.04, configuration: Debug, arch: amd64 }
1715
runs-on: ${{matrix.m.os}}
1816
name: 'Linux ${{matrix.m.configuration}} ${{matrix.m.arch}}'
@@ -31,36 +29,10 @@ jobs:
3129
sudo apt-get update
3230
sudo apt-get install cmake ninja-build qtbase5-dev qttools5-dev libqscintilla2-qt5-dev libqtermwidget5-1-dev libutf8proc-dev
3331
34-
- name: i386 | Install libs
35-
if: matrix.m.arch == 'i386'
36-
run: |
37-
sudo dpkg --add-architecture i386
38-
sudo apt-get remove libutf8proc2
39-
sudo apt-get update
40-
sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7 # fix CI error https://github.com/actions/virtual-environments/issues/4620
41-
# additional i386 packages:
42-
sudo apt-get install libqt5help5:i386 libqt5designercomponents5:i386 libqt5designer5:i386 libqscintilla2-qt5-l10n
43-
# real packages:
44-
sudo apt-get install gcc-multilib g++-multilib cmake ninja-build qtbase5-dev:i386 qttools5-dev:i386
45-
# libqscintilla2-qt5-dev:i386 and libqtermwidget5-0-dev:i386 is missing in ubuntu 20.04, will take it from launchpad
46-
mkdir i386 && cd i386
47-
curl -LJO https://github.com/q4a/juffed/releases/download/i386-deps/libqscintilla2-qt5-15_2.11.2+dfsg-5_i386.deb
48-
curl -LJO https://github.com/q4a/juffed/releases/download/i386-deps/libqscintilla2-qt5-dev_2.11.2+dfsg-5_i386.deb
49-
curl -LJO https://github.com/q4a/juffed/releases/download/i386-deps/libqtermwidget5-0-dev_0.14.1-0ubuntu3_i386.deb
50-
curl -LJO https://github.com/q4a/juffed/releases/download/i386-deps/libqtermwidget5-0_0.14.1-0ubuntu3_i386.deb
51-
curl -LJO https://github.com/q4a/juffed/releases/download/i386-deps/libutf8proc-dev_2.4.0-2build1_i386.deb
52-
curl -LJO https://github.com/q4a/juffed/releases/download/i386-deps/libutf8proc2_2.4.0-2build1_i386.deb
53-
curl -LJO https://github.com/q4a/juffed/releases/download/i386-deps/qtermwidget5-data_0.14.1-0ubuntu3_all.deb
54-
sudo dpkg -i *.deb
55-
5632
- name: Debug amd64 | Configure with cmake
5733
if: matrix.m.configuration == 'Debug' && matrix.m.arch == 'amd64'
5834
run: mkdir build && cd build && cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.m.configuration}}
5935

60-
- name: Debug i386 | Configure with cmake
61-
if: matrix.m.configuration == 'Debug' && matrix.m.arch == 'i386'
62-
run: mkdir build && cd build && CXXFLAGS="-m32" cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.m.configuration}}
63-
6436
- name: Debug | Build with cmake
6537
if: matrix.m.configuration == 'Debug'
6638
run: ninja
@@ -72,18 +44,6 @@ jobs:
7244
sudo apt-get install devscripts debhelper libenca-dev build-essential
7345
debuild -b -uc -us
7446
75-
- name: Release i386 | Build deb packages with cross-config + dpkg-buildpackage
76-
if: matrix.m.configuration == 'Release' && matrix.m.arch == 'i386'
77-
run: |
78-
sudo apt-get install build-essential crossbuild-essential-i386 debhelper
79-
# libenca-dev:i386 is missing in ubuntu 20.04, will take it from launchpad
80-
mkdir x86 && cd x86
81-
curl -LJO https://github.com/q4a/juffed/releases/download/i386-deps/libenca-dev_1.19-1_i386.deb
82-
curl -LJO https://github.com/q4a/juffed/releases/download/i386-deps/libenca0_1.19-1_i386.deb
83-
sudo dpkg -i *.deb
84-
cd ..
85-
CONFIG_SITE=/etc/dpkg-cross/cross-config.amd64 DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -Pcross,nocheck -ai386 -b -uc -us
86-
8747
- name: armv7, aarch64 | Install libs and build with dpkg-buildpackage
8848
if: matrix.m.arch == 'armv7' || matrix.m.arch == 'aarch64'
8949
uses: uraimo/run-on-arch-action@v3

0 commit comments

Comments
 (0)