Skip to content

Commit e64db8b

Browse files
committed
ci: Switch Ubuntu to 64-bit
It's time to accept that Ubuntu can't properly support multiarch to binutils level. Just build the x86_x64.
1 parent 3ff4e4f commit e64db8b

File tree

1 file changed

+10
-20
lines changed

1 file changed

+10
-20
lines changed

.github/workflows/build.yaml

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ on:
1313
type: string
1414

1515
jobs:
16-
ubuntu-gcc-x86:
17-
runs-on: ubuntu-20.04
18-
name: "Linux Ubuntu, arch x86"
16+
ubuntu-gcc-x86_64:
17+
runs-on: ubuntu-22.04
18+
name: "Linux Ubuntu, arch x86_64"
1919
container:
20-
image: ubuntu:20.04
20+
image: ubuntu:22.04
2121
env:
2222
DEBIAN_FRONTEND: noninteractive
2323
TZ: Etc/UTC
@@ -49,18 +49,13 @@ jobs:
4949
5050
- name: Install dependencies
5151
run: |
52-
# add i386 dependencies
53-
dpkg --add-architecture i386
54-
5552
apt update
56-
apt install -y \
57-
gcc-multilib g++-multilib lib32z1
5853
5954
apt install -y \
60-
libc6-dev:i386 gettext:i386 \
61-
libiberty-dev:i386 \
62-
binutils-dev:i386 \
63-
libzstd-dev:i386
55+
libc6-dev gettext \
56+
libiberty-dev \
57+
binutils-dev \
58+
libzstd-dev
6459
6560
apt install -y \
6661
build-essential autoconf libtool make
@@ -70,11 +65,6 @@ jobs:
7065

7166
- name: Configure
7267
id: configure-app
73-
env:
74-
CFLAGS: "-m32"
75-
CXXFLAGS: "-m32"
76-
LDFLAGS: "-m32"
77-
PKG_CONFIG_PATH: "/usr/lib/i386-linux-gnu/pkgconfig"
7868
run: |
7969
mkdir -p release; cd release
8070
../configure
@@ -83,7 +73,7 @@ jobs:
8373
if: failure() && steps.configure-app.outcome != 'success'
8474
uses: actions/upload-artifact@v3
8575
with:
86-
name: configure-ubuntu-x86-logs
76+
name: configure-ubuntu-x86_64-logs
8777
path: release/config.log
8878
retention-days: 10
8979

@@ -98,7 +88,7 @@ jobs:
9888
# Get version marking from C header
9989
PKG_VERSION=$(sed -n 's/^#define[ ]\+PACKAGE_VERSION "\([^"]\+\)"$/\1/p' src/config.h | head -n 1 | tr '.' '_')
10090
make V=1 DESTDIR=$PWD/pkg install
101-
echo "PKG_NAME=le_disasm-$PKG_VERSION-ubuntu-x86" >> $GITHUB_ENV
91+
echo "PKG_NAME=le_disasm-$PKG_VERSION-ubuntu-x86_64" >> $GITHUB_ENV
10292
10393
- name: Upload artifacts
10494
uses: actions/upload-artifact@v3

0 commit comments

Comments
 (0)