GitHub Actions: remove i386 autobuild packages (#5345)
They are newly failing since the previous commit (upgrading to Ubuntu focal), so instead of debugging what the issue is, let’s just remove them entirely. Not many i386 users are left, as the world is on amd64 and arm64 these days.
This commit is contained in:
Michael Stapelberg
GitHub
parent
944a262688
commit
46de32eedd
16
.github/workflows/main.yml
vendored
16
.github/workflows/main.yml
vendored
@ -28,23 +28,13 @@ jobs:
|
||||
- name: construct container name
|
||||
run: |
|
||||
echo "BASENAME=i3wm/travis-base:$(date +'%Y-%m')-$(./travis/ha.sh travis/travis-base.Dockerfile)" >> $GITHUB_ENV
|
||||
echo "BASENAME_386=i3wm/travis-base-386:$(date +'%Y-%m')-$(./travis/ha.sh travis/travis-base-386.Dockerfile)" >> $GITHUB_ENV
|
||||
echo "BASENAME_UBUNTU=i3wm/travis-base-ubuntu:$(date +'%Y-%m')-$(./travis/ha.sh travis/travis-base-ubuntu.Dockerfile)" >> $GITHUB_ENV
|
||||
echo "BASENAME_UBUNTU_386=i3wm/travis-base-ubuntu-386:$(date +'%Y-%m')-$(./travis/ha.sh travis/travis-base-ubuntu-386.Dockerfile)" >> $GITHUB_ENV
|
||||
- name: fetch or build Docker container
|
||||
run: |
|
||||
docker pull ${{ env.BASENAME }} || ./travis/docker-build-and-push.sh ${{ env.BASENAME }} travis/travis-base.Dockerfile
|
||||
- name: fetch or build extra Docker containers
|
||||
run: |
|
||||
echo "::group::Ubuntu amd64"
|
||||
./travis/skip-pkg.sh || docker pull ${{ env.BASENAME_UBUNTU }} || ./travis/docker-build-and-push.sh ${{ env.BASENAME_UBUNTU }} travis/travis-base-ubuntu.Dockerfile
|
||||
echo "::endgroup::"
|
||||
echo "::group::Debian i386"
|
||||
./travis/skip-pkg.sh || docker pull ${{ env.BASENAME_386 }} || ./travis/docker-build-and-push.sh ${{ env.BASENAME_386 }} travis/travis-base-386.Dockerfile
|
||||
echo "::endgroup::"
|
||||
echo "::group::Ubuntu i386"
|
||||
./travis/skip-pkg.sh || docker pull ${{ env.BASENAME_UBUNTU_386 }} || ./travis/docker-build-and-push.sh ${{ env.BASENAME_UBUNTU_386 }} travis/travis-base-ubuntu-386.Dockerfile
|
||||
echo "::endgroup::"
|
||||
- name: build i3
|
||||
run: |
|
||||
docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${{ env.BASENAME }} /bin/sh -c 'rm -rf build; mkdir -p build && cd build && CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Werror -fno-common -D_FORTIFY_SOURCE=2" meson setup .. -Ddocs=true -Dmans=true -Db_sanitize=address --buildtype=debugoptimized && ninja -v'
|
||||
@ -71,12 +61,6 @@ jobs:
|
||||
echo "::group::Ubuntu amd64"
|
||||
./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${{ env.BASENAME_UBUNTU }} ./travis/debian-build.sh deb/ubuntu-amd64/DIST
|
||||
echo "::endgroup::"
|
||||
echo "::group::Debian i386"
|
||||
./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${{ env.BASENAME_386 }} linux32 ./travis/debian-build.sh deb/debian-i386/DIST
|
||||
echo "::endgroup::"
|
||||
echo "::group::Ubuntu i386"
|
||||
./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${{ env.BASENAME_UBUNTU_386 }} linux32 ./travis/debian-build.sh deb/ubuntu-i386/DIST
|
||||
echo "::endgroup::"
|
||||
- name: push Debian packages to balto
|
||||
run: |
|
||||
./travis/skip-pkg.sh || travis/push-balto.sh
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
set -e
|
||||
|
||||
for fn in distbuild/deb/debian-amd64/*.deb distbuild/deb/debian-i386/*.deb
|
||||
for fn in distbuild/deb/debian-amd64/*.deb
|
||||
do
|
||||
echo "pushing $fn to balto"
|
||||
curl \
|
||||
@ -12,7 +12,7 @@ do
|
||||
https://i3.baltorepo.com/i3/i3-autobuild/upload/
|
||||
done
|
||||
|
||||
for fn in distbuild/deb/ubuntu-amd64/*.deb distbuild/deb/ubuntu-i386/*.deb
|
||||
for fn in distbuild/deb/ubuntu-amd64/*.deb
|
||||
do
|
||||
echo "pushing $fn to balto"
|
||||
curl \
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
# vim:ft=Dockerfile
|
||||
# Same as travis-base.Dockerfile, but without the test suite dependencies since
|
||||
# we only build Debian packages on i386, we don’t run the tests.
|
||||
FROM i386/debian:sid
|
||||
|
||||
RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
|
||||
# Paper over occasional network flakiness of some mirrors.
|
||||
RUN echo 'APT::Acquire::Retries "5";' > /etc/apt/apt.conf.d/80retry
|
||||
|
||||
# NOTE: I tried exclusively using gce_debian_mirror.storage.googleapis.com
|
||||
# instead of httpredir.debian.org, but the results (Fetched 123 MB in 36s (3357
|
||||
# kB/s)) are not any better than httpredir.debian.org (Fetched 123 MB in 34s
|
||||
# (3608 kB/s)). Hence, let’s stick with httpredir.debian.org (default) for now.
|
||||
|
||||
# Install mk-build-deps (for installing the i3 build dependencies),
|
||||
# lintian (for checking spelling errors),
|
||||
RUN linux32 apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||
dpkg-dev devscripts git equivs \
|
||||
build-essential clang \
|
||||
lintian && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install i3 build dependencies.
|
||||
COPY debian/control /usr/src/i3-debian-packaging/control
|
||||
RUN linux32 apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# The user outside of Docker (GitHub Actions CI runner) and inside of Docker
|
||||
# (root) are different, and newer versions of git error out in that scenario.
|
||||
# To fix this, explicitly configure /usr/src/i3 as a safe directory:
|
||||
RUN git config --global --add safe.directory /usr/src/i3
|
||||
@ -1,33 +0,0 @@
|
||||
# vim:ft=Dockerfile
|
||||
# Same as travis-base.Dockerfile, but without the test suite dependencies since
|
||||
# we only build Debian packages on Ubuntu i386, we don’t run the tests.
|
||||
FROM i386/ubuntu:focal
|
||||
|
||||
RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
|
||||
# Paper over occasional network flakiness of some mirrors.
|
||||
RUN echo 'APT::Acquire::Retries "5";' > /etc/apt/apt.conf.d/80retry
|
||||
|
||||
# NOTE: I tried exclusively using gce_debian_mirror.storage.googleapis.com
|
||||
# instead of httpredir.debian.org, but the results (Fetched 123 MB in 36s (3357
|
||||
# kB/s)) are not any better than httpredir.debian.org (Fetched 123 MB in 34s
|
||||
# (3608 kB/s)). Hence, let’s stick with httpredir.debian.org (default) for now.
|
||||
|
||||
# Install mk-build-deps (for installing the i3 build dependencies),
|
||||
# lintian (for checking spelling errors),
|
||||
RUN linux32 apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||
dpkg-dev devscripts git equivs \
|
||||
build-essential clang \
|
||||
lintian && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install i3 build dependencies.
|
||||
COPY debian/control /usr/src/i3-debian-packaging/control
|
||||
RUN linux32 apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# The user outside of Docker (GitHub Actions CI runner) and inside of Docker
|
||||
# (root) are different, and newer versions of git error out in that scenario.
|
||||
# To fix this, explicitly configure /usr/src/i3 as a safe directory:
|
||||
RUN git config --global --add safe.directory /usr/src/i3
|
||||
Loading…
x
Reference in New Issue
Block a user