From 4db673b2ff6b66b0a971f13cd60a6592e65c6040 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Thu, 10 Dec 2020 20:22:00 -0500
Subject: [PATCH] ci: Fix Ubuntu-18.04/16.04 runs

---
 .github/workflows/build.yml | 1 +
 ci/ci-install.bash          | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 50d8b3850..cd55813f5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,6 +24,7 @@ jobs:
     name: Ubuntu 20.04 | ${{ matrix.cc }} | build-test
     env:
       CI_OS_NAME: linux
+      CI_RUNS_ON: ubuntu-20.04
       CI_COMMIT: ${{ github.sha }}
       CCACHE_COMPRESS: 1
       CCACHE_DIR: ${{ github.workspace }}/.ccache
diff --git a/ci/ci-install.bash b/ci/ci-install.bash
index 757ccb053..302b02cb9 100755
--- a/ci/ci-install.bash
+++ b/ci/ci-install.bash
@@ -49,7 +49,9 @@ if [ "$CI_BUILD_STAGE_NAME" = "build" ]; then
     sudo apt-get install libfl-dev
     sudo apt-get install libgoogle-perftools-dev
     sudo apt-get install ccache
-    sudo apt-get install libsystemc libsystemc-dev
+    if [ "$CI_RUNS_ON" = "ubuntu-20.04" ]; then
+      sudo apt-get install libsystemc libsystemc-dev
+    fi
     if [ "$COVERAGE" = 1 ]; then
       yes yes | sudo cpan -fi Unix::Processors Parallel::Forker
     fi
@@ -72,7 +74,7 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then
   if [ "$CI_OS_NAME" = "linux" ]; then
     sudo apt-get update
     sudo apt-get install gdb gtkwave lcov
-    if [ "$CI_DIST" = "focal" ]; then
+    if [ "$CI_RUNS_ON" = "ubuntu-20.04" ]; then
       sudo apt-get install libsystemc-dev
     fi
     if [ "$M32" = 1 ]; then
@@ -89,7 +91,7 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then
     fatal "Unknown os: '$CI_OS_NAME'"
   fi
   # Common installs
-  if [ "$CI_DIST" != "trusty" ]; then
+  if [ "$CI_RUNS_ON" != "ubuntu-14.04" ]; then
     CI_CPAN_REPO=https://cpan.org
   fi
   yes yes | sudo cpan -M $CI_CPAN_REPO -fi Unix::Processors Parallel::Forker