From 82cd67b2d059708024cdb1aac1f009ca5edcfcd0 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Sun, 8 Sep 2024 10:31:14 +0300
Subject: [PATCH] Travis CI: Use Ubuntu Focal for arm64 builds (a cherry-pick
 of commit b8497d81f2 from 'release-8_2')

The Ubuntu dist (Jammy) is not bootable on Travis CI at this moment on
the arm64 host.
---
 .travis.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 77345d394..1e08ee1d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,16 +72,20 @@ jobs:
     - CPPCHECK_OUT_FILTER="Z"
   - arch: arm64
     compiler: clang
+    dist: focal
   - arch: arm64
     compiler: gcc
+    dist: focal
   - arch: arm64
     compiler: clang
+    dist: focal
     env:
     - CFLAGS_EXTRA="-O3"
     - CONF_OPTIONS="--enable-gc-assertions --enable-cplusplus --disable-shared"
     - NO_CLONE_LIBATOMIC_OPS=true
   - arch: arm64
     compiler: gcc
+    dist: focal
     env:
     - CFLAGS_EXTRA="-O3 -D SIMULATE_LOST_SIGNALS -D TRACE_BUF"
     - CONF_OPTIONS="--enable-cplusplus --disable-gcj-support"
@@ -100,20 +104,23 @@ jobs:
     - NO_CLONE_LIBATOMIC_OPS=true
   - arch: arm64
     compiler: gcc
+    dist: focal
     env:
     - CONF_OPTIONS="--disable-threads"
     - NO_CLONE_LIBATOMIC_OPS=true
-  - arch: arm64
-    addons:
+  - addons:
       apt:
         packages:
         - libatomic-ops-dev
+    arch: arm64
     compiler: gcc
+    dist: focal
     env:
     - CONF_OPTIONS="--with-libatomic-ops=yes --enable-gc-assertions --enable-cplusplus --disable-munmap"
     - NO_CLONE_LIBATOMIC_OPS=true
   - arch: arm64
     compiler: clang
+    dist: focal
     language: c
     env:
     - CFLAGS_EXTRA="-fsanitize=memory,undefined -fno-omit-frame-pointer"
@@ -122,11 +129,13 @@ jobs:
     - TESTS_CUSTOM_RUN=true
   - arch: arm64
     compiler: clang
+    dist: focal
     env:
     - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=MinSizeRel -DBUILD_SHARED_LIBS=OFF -Denable_cplusplus=ON -Denable_gc_assertions=ON"
     - NO_CLONE_LIBATOMIC_OPS=true
   - arch: arm64
     compiler: gcc
+    dist: focal
     env:
     - MAKEFILE_NAME=Makefile.direct
     - MAKEFILE_TARGETS="check cord/de"