Revert "[gitian] bump Ubuntu 20.04 LTS"

This reverts commit c22fa36b3e.
This commit is contained in:
wowario
2024-09-28 11:41:57 +03:00
parent 799ffffdac
commit 9aa5364d15
7 changed files with 12 additions and 12 deletions
+4 -4
View File
@@ -17,8 +17,8 @@ fi
GH_USER=${GH_USER-$USER}
TAG=gitrun-focal
TAG2=base-focal-amd64
TAG=gitrun-bionic
TAG2=base-bionic-amd64
IMAGE=`docker images | grep $TAG`
WORKDIR=/home/ubuntu
@@ -30,7 +30,7 @@ cd docker
# container for running gitian-build.py
cat <<EOF > ${TAG}.Dockerfile
FROM ubuntu:focal
FROM ubuntu:bionic
ENV DEBIAN_FRONTEND=noninteractive
RUN echo 'Acquire::http { Proxy "http://172.17.0.1:3142"; };' > /etc/apt/apt.conf.d/50cacher
@@ -63,7 +63,7 @@ cd docker
# container for actually running each build
cat <<EOF > ${TAG2}.Dockerfile
FROM ubuntu:focal
FROM ubuntu:bionic
ENV DEBIAN_FRONTEND=noninteractive
RUN echo 'Acquire::http { Proxy "http://172.17.0.1:3142"; };' > /etc/apt/apt.conf.d/50cacher
+1 -1
View File
@@ -2,7 +2,7 @@
name: "wownero-android-0.11"
enable_cache: true
suites:
- "focal"
- "bionic"
architectures:
- "amd64"
packages:
+3 -3
View File
@@ -36,7 +36,7 @@ def setup():
subprocess.check_call(['rm', 'wownero', '-fR'])
subprocess.check_call(['git', 'clone', args.url, 'wownero'])
os.chdir('..')
make_image_prog = ['bin/make-base-vm', '--suite', 'focal', '--arch', 'amd64']
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker:
try:
subprocess.check_output(['docker', '--help'])
@@ -48,7 +48,7 @@ def setup():
make_image_prog += ['--lxc']
subprocess.check_call(make_image_prog)
os.chdir(workdir)
if args.is_focal and not args.kvm and not args.docker:
if args.is_bionic and not args.kvm and not args.docker:
subprocess.check_call(['sudo', 'sed', '-i', 's/lxcbr0/br0/', '/etc/default/lxc-net'])
print('Reboot is required')
sys.exit(0)
@@ -134,7 +134,7 @@ def main():
args = parser.parse_args()
workdir = os.getcwd()
args.is_focal = b'focal' in subprocess.check_output(['lsb_release', '-cs'])
args.is_bionic = b'bionic' in subprocess.check_output(['lsb_release', '-cs'])
if args.buildsign:
args.build = True
+1 -1
View File
@@ -2,7 +2,7 @@
name: "wownero-freebsd-0.11"
enable_cache: true
suites:
- "focal"
- "bionic"
architectures:
- "amd64"
packages:
+1 -1
View File
@@ -2,7 +2,7 @@
name: "wownero-linux-0.11"
enable_cache: true
suites:
- "focal"
- "bionic"
architectures:
- "amd64"
packages:
+1 -1
View File
@@ -2,7 +2,7 @@
name: "wownero-osx-0.11"
enable_cache: true
suites:
- "focal"
- "bionic"
architectures:
- "amd64"
packages:
+1 -1
View File
@@ -2,7 +2,7 @@
name: "wownero-win-0.11"
enable_cache: true
suites:
- "focal"
- "bionic"
architectures:
- "amd64"
packages: