From 63315c88d233f86e170ebcfdfe2926dfcef8ec4f Mon Sep 17 00:00:00 2001
From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Sun, 22 Nov 2020 19:10:11 +0530
Subject: [PATCH] Circle CI - move to Ubuntu 20.04

---
 .circleci/config.yml | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 51281966..7724129e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   compile:
     docker:
-      - image: ubuntu:18.04
+      - image: ubuntu:20.04
         working_directory: ~/nnn
         environment:
           CI_FORCE_TEST: 1
@@ -11,12 +11,11 @@ jobs:
       - run:
           command: |
             apt update -qq
+            DEBIAN_FRONTEND="noninteractive" TZ="America/New_York" apt-get -y install tzdata
             apt install -y --no-install-recommends software-properties-common wget gpg-agent shellcheck
-            apt-add-repository -y ppa:jonathonf/gcc-9.1
-            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add -
-            apt-add-repository -y "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main"
-            apt update -qq
-            apt install -y --no-install-recommends git gcc gcc-8 gcc-9 clang clang-8 clang-9 clang-tidy-9 make pkg-config libncursesw5-dev libreadline-dev
+            apt install -y --no-install-recommends git make pkg-config libncurses-dev libreadline-dev
+            apt install -y --no-install-recommends gcc gcc-7 gcc-8 gcc-10
+            apt install -y --no-install-recommends clang clang-6.0 clang-7 clang-8 clang-9 clang-tidy-10
       - checkout
       - run:
           command: |
@@ -28,13 +27,18 @@ jobs:
             ls -l nnn
             make clean
             echo
+            echo "########## gcc-7 ##########"
+            CC=gcc-7 make strip
+            ls -l nnn
+            make clean
+            echo
             echo "########## gcc-8 ##########"
             CC=gcc-8 make strip
             ls -l nnn
             make clean
             echo
-            echo "########## gcc-9 ##########"
-            CC=gcc-9 make strip
+            echo "########## gcc-10 ##########"
+            CC=gcc-8 make strip
             ls -l nnn
             make clean
             echo
@@ -43,6 +47,16 @@ jobs:
             ls -l nnn
             make clean
             echo
+            echo "########## clang-6 ##########"
+            CC=clang-6.0 make strip
+            ls -l nnn
+            make clean
+            echo
+            echo "########## clang-7 ##########"
+            CC=clang-7 make strip
+            ls -l nnn
+            make clean
+            echo
             echo "########## clang-8 ##########"
             CC=clang-8 make strip
             ls -l nnn
@@ -53,8 +67,8 @@ jobs:
             ls -l nnn
             make clean
             echo
-            echo "########## clang-tidy-9 ##########"
-            clang-tidy-9 src/* -- -I/usr/include -I/usr/include/ncursesw
+            echo "########## clang-tidy-10 ##########"
+            clang-tidy-10 src/* -- -I/usr/include -I/usr/include/ncursesw
             echo "########## shellcheck ##########"
             find plugins/ -type f -not -name "*.md" -exec shellcheck -e SC1090 {} +