From b45572167d39b0a454ba5f44cf96536adf5a5d62 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sun, 20 Jun 2021 23:03:29 -0700
Subject: [PATCH] [build] Change CI back to 18.04 docker images (#3456)

This reverts commit d068fb321fa912a2e8685acd7728de1f19a3ee64 (#3420).

The 18.04 docker images now use GCC 8, which was the original reason for
updating.  20.04 uses a much more recent libc, so staying with 18.04
enables more Linux platforms to use the binaries.
---
 .github/workflows/cmake.yml  | 2 +-
 .github/workflows/gazebo.yml | 2 +-
 .github/workflows/gradle.yml | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 030d5a62f3..5c49afabc3 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -10,7 +10,7 @@ jobs:
         include:
           - os: ubuntu-latest
             name: Linux
-            container: wpilib/roborio-cross-ubuntu:2021-20.04
+            container: wpilib/roborio-cross-ubuntu:2021-18.04
             flags: ""
           - os: macos-latest
             name: macOS
diff --git a/.github/workflows/gazebo.yml b/.github/workflows/gazebo.yml
index 9d8de897bb..d1f90ed590 100644
--- a/.github/workflows/gazebo.yml
+++ b/.github/workflows/gazebo.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     name: "Build"
     runs-on: ubuntu-latest
-    container: wpilib/gazebo-ubuntu:20.04
+    container: wpilib/gazebo-ubuntu:18.04
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index dff5d0f601..56b01bfdeb 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -8,16 +8,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - container: wpilib/roborio-cross-ubuntu:2021-20.04
+          - container: wpilib/roborio-cross-ubuntu:2021-18.04
             artifact-name: Athena
             build-options: "-Ponlylinuxathena"
-          - container: wpilib/raspbian-cross-ubuntu:10-20.04
+          - container: wpilib/raspbian-cross-ubuntu:10-18.04
             artifact-name: Raspbian
             build-options: "-Ponlylinuxraspbian"
-          - container: wpilib/aarch64-cross-ubuntu:bionic-20.04
+          - container: wpilib/aarch64-cross-ubuntu:bionic-18.04
             artifact-name: Aarch64
             build-options: "-Ponlylinuxaarch64bionic"
-          - container: wpilib/ubuntu-base:20.04
+          - container: wpilib/ubuntu-base:18.04
             artifact-name: Linux
             build-options: "-Dorg.gradle.jvmargs=-Xmx2g"
     name: "Build - ${{ matrix.artifact-name }}"