Skip to content

Commit 7491e5a

Browse files
pcncdarora
authored andcommittedDec 1, 2023
chore: remove ubuntu 18 support
1 parent ebb8120 commit 7491e5a

File tree

10 files changed

+5
-1243
lines changed

10 files changed

+5
-1243
lines changed
 

‎.github/workflows/collect-u18-binaries.yml

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

‎Dockerfile-u18

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

‎ansible/tasks/finalize-ami.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,13 @@
2727
port: http
2828
tags:
2929
- install-supabase-internal
30-
when: ansible_distribution_version != "18.04"
3130

3231
- name: UFW - Allow connections to https (443)
3332
ufw:
3433
rule: allow
3534
port: https
3635
tags:
3736
- install-supabase-internal
38-
when: ansible_distribution_version != "18.04"
39-
40-
- name: UFW - Allow connections to http (80) - Ubuntu 18.04
41-
ufw:
42-
rule: allow
43-
port: "80"
44-
tags:
45-
- install-supabase-internal
46-
when: ansible_distribution_version == "18.04"
47-
48-
- name: UFW - Allow connections to https (443) - Ubuntu 18.04
49-
ufw:
50-
rule: allow
51-
port: "443"
52-
tags:
53-
- install-supabase-internal
54-
when: ansible_distribution_version == "18.04"
5537

5638
- name: UFW - Deny all other incoming traffic by default
5739
ufw:
@@ -88,7 +70,6 @@
8870
sed -i -e 's;daily;*:0/10;' /etc/systemd/system/logrotate.timer
8971
systemctl reenable logrotate.timer
9072
become: yes
91-
when: ansible_distribution_version != "18.04"
9273

9374
- name: import pgsodium_getkey script
9475
template:

‎ansible/tasks/internal/supautils.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,6 @@
66
- clang-11
77
update_cache: yes
88
cache_valid_time: 3600
9-
when: ansible_distribution_version != "18.04"
10-
11-
- name: supautils - download & install dependencies - Ubuntu 18.04
12-
apt:
13-
pkg:
14-
- build-essential
15-
- clang-12
16-
update_cache: yes
17-
cache_valid_time: 3600
18-
when: ansible_distribution_version == "18.04"
199

2010
- name: supautils - download latest release
2111
get_url:

‎ansible/tasks/postgres-extensions/28-pgvector.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@
66
version: 'v{{ pgvector_release }}'
77
become: yes
88

9-
- name: pgvector - ubuntu 18.04 compat
10-
lineinfile:
11-
path: /tmp/pgvector/Makefile
12-
regexp: "march=native$"
13-
line: "OPTFLAGS = "
14-
firstmatch: true
15-
when: ansible_distribution_version == "18.04"
16-
179
- name: pgvector - build
1810
make:
1911
chdir: /tmp/pgvector

‎ansible/tasks/setup-docker.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@
99
set -e
1010
apt-get update
1111
apt-get install -y --no-install-recommends /tmp/extensions/*.deb
12-
when: ansible_distribution_version != "18.04"
13-
14-
# Builtin apt module does not support wildcard for deb paths
15-
- name: Install extensions - Ubuntu 18.04
16-
shell: |
17-
set -e
18-
apt-get update
19-
apt-get install -y /tmp/extensions/*.deb
20-
when: ansible_distribution_version == "18.04"
2112
2213
- name: pg_cron - set cron.database_name
2314
become: yes

‎ansible/tasks/setup-postgres.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121
apt:
2222
name: postgresql-{{ postgresql_major }}={{ postgresql_release }}-1.pgdg20.04+1
2323
install_recommends: no
24-
when: ansible_distribution_version != "18.04"
25-
26-
- name: Postgres - install server - Ubuntu 18.04
27-
apt:
28-
name: postgresql-{{ postgresql_major }}={{ postgresql_release }}-1.pgdg18.04+1
29-
install_recommends: no
30-
when: ansible_distribution_version == "18.04"
3124

3225
- name: Postgres - remove PPA
3326
apt_repository:

‎ebssurrogate/scripts/chroot-bootstrap.sh

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ fi
2525

2626
function update_install_packages {
2727
source /etc/os-release
28-
if [ "${UBUNTU_CODENAME}" = "bionic" ]; then
29-
sed -i 's/focal/bionic/g' /etc/apt/sources.list
30-
fi
3128

3229
# Update APT with new sources
3330
cat /etc/apt/sources.list
@@ -78,18 +75,6 @@ function update_install_packages {
7875
if [ "${ARCH}" = "arm64" ]; then
7976
apt-get $APT_OPTIONS --yes install linux-aws initramfs-tools dosfstools
8077
fi
81-
82-
if [ "${UBUNTU_CODENAME}" = "bionic" ]; then
83-
echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main" >> /etc/apt/sources.list
84-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
85-
add-apt-repository --yes --update ppa:ubuntu-toolchain-r/test
86-
87-
# Install cmake 3.12+
88-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add -
89-
apt-add-repository --yes --update 'deb https://apt.kitware.com/ubuntu/ bionic main'
90-
91-
apt-get $APT_OPTIONS update
92-
fi
9378
}
9479

9580
function setup_locale {
@@ -118,14 +103,10 @@ function install_packages_for_build {
118103
liblzo2-dev
119104

120105
source /etc/os-release
121-
if [ "${UBUNTU_CODENAME}" = "bionic" ]; then
122-
apt-get install -y --no-install-recommends llvm-12-dev clang-12 cmake
123-
apt-mark manual libllvm12:arm64
124-
else
125-
apt-get install -y --no-install-recommends llvm-11-dev clang-11
126-
# Mark llvm as manual to prevent auto removal
127-
apt-mark manual libllvm11:arm64
128-
fi
106+
107+
apt-get install -y --no-install-recommends llvm-11-dev clang-11
108+
# Mark llvm as manual to prevent auto removal
109+
apt-mark manual libllvm11:arm64
129110
}
130111

131112
function setup_apparmor {

‎legacy.vars.pkr.hcl

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

‎scripts/90-cleanup.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ elif [ -n "$(command -v apt-get)" ]; then
3939
libgcc-8-dev
4040

4141
source /etc/os-release
42-
if [ "${UBUNTU_CODENAME}" != "bionic" ]; then
43-
apt-get -y remove --purge linux-headers-5.11.0-1021-aws
44-
fi
42+
apt-get -y remove --purge linux-headers-5.11.0-1021-aws
4543

4644
apt-get -y update
4745
apt-get -y upgrade

0 commit comments

Comments
 (0)
Please sign in to comment.