Skip to content

Commit 2ae4ab2

Browse files
mcleinmanoskirby
andauthored
Uplift: Remove support for Ubuntu/bionic (#6855) (#7420)
* Remove support for Ubuntu/bionic (#6855) * for another taskcluster run * taskcluster trigger --------- Co-authored-by: Naomi Kirby <oskirby@gmail.com>
1 parent f545cac commit 2ae4ab2

File tree

7 files changed

+5
-44
lines changed

7 files changed

+5
-44
lines changed

.github/workflows/ppa-automation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
5656
GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
5757
GNUPGHOME: ${{ runner.temp }}/gnupg-data
58-
PPA_TARGET_DISTS: bionic focal jammy kinetic lunar
58+
PPA_TARGET_DISTS: focal jammy kinetic lunar
5959
PPA_URL: ${{ steps.gen-source.outputs.ppa-url }}
6060
run: |
6161
mkdir -m700 $GNUPGHOME

linux/bionic/Dockerfile

Lines changed: 0 additions & 2 deletions
This file was deleted.

linux/bionic/README.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

linux/debian/control

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ Priority: optional
44
Maintainer: mozilla <vpn@mozilla.com>
55
Build-Depends: debhelper (>= 9.20160709),
66
cdbs,
7-
cmake (>= 3.16~) | cmake-mozilla (>= 3.16~),
7+
cmake (>= 3.16~),
88
flex,
9-
gcc (>=4:8.0.0~) | gcc-8,
10-
g++ (>=4:8.0.0~) | g++-8,
9+
gcc (>=4:8.0.0~),
10+
g++ (>=4:8.0.0~),
1111
golang (>=2:1.18~) | golang-1.18,
1212
cargo,
1313
python3-yaml,
1414
python3-jinja2,
1515
python3-click,
1616
libgl-dev,
17-
libopengl-dev (>= 1.3.0~) | libglvnd-dev (<< 1.3.0~),
17+
libopengl-dev (>= 1.3.0~),
1818
libqt6core5compat6-dev (>=6.2.0~),
1919
libqt6networkauth6-dev (>=6.2.0~),
2020
libqt6opengl6-dev (>=6.2.0~),

linux/debian/rules

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ ifneq (ok,$(shell dpkg --compare-versions $(GOLANG_NATIVE_VERSION) ge 2:1.18 &&
1111
export PATH := $(GODIR)/bin:$(PATH)
1212
endif
1313

14-
GCC_NATIVE_VERSION = $(shell gcc -dumpversion 2>/dev/null || echo 0)
15-
ifneq (ok,$(shell dpkg --compare-versions $(GCC_NATIVE_VERSION) ge 8 && echo ok))
16-
export CC := gcc-8
17-
export CXX := g++-8
18-
endif
19-
2014
%:
2115
dh $@ --with=systemd --warn-missing
2216

taskcluster/ci/build/linux.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@ task-defaults:
2525
use-caches: true
2626
command: /builds/worker/builder.sh
2727

28-
linux/bionic:
29-
description: "Linux Build (Ubuntu/Bionic)"
30-
treeherder:
31-
platform: linux/bionic
32-
worker:
33-
docker-image: {in-tree: linux-build-bionic}
34-
add-index-routes:
35-
name: linux-bionic
36-
type: build
37-
3828
linux/focal:
3929
description: "Linux Build (Ubuntu/Focal)"
4030
treeherder:

taskcluster/ci/docker-image/kind.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,6 @@ tasks:
7676
args:
7777
ANDROID_ARCH: android_armv7
7878
QT_VERSION: 6.4.0
79-
linux-build-bionic:
80-
symbol: I(linux-bionic)
81-
definition: linux-dpkg-build
82-
args:
83-
DOCKER_BASE_IMAGE: ubuntu:bionic
84-
QTPPA: ppa:okirby/qt6-backports
8579
linux-build-focal:
8680
symbol: I(linux-focal)
8781
definition: linux-dpkg-build

0 commit comments

Comments
 (0)