From 723480483414df560a79e4f1f138df97c783f276 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Sat, 24 Oct 2020 00:07:24 -0700
Subject: [PATCH] ubuntu 16.04 -> 20.04 (#97)

* ubuntu 20.04

* non interactive

* fix src prefix
---
 .github/workflows/tests.yml | 10 +++++-----
 Dockerfile                  |  3 ++-
 SConscript                  |  5 +++--
 SConstruct                  |  7 +++----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 24ea58c..26ecc11 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   build:
     name: build
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Build docker image
@@ -27,7 +27,7 @@ jobs:
 
   unit_tests:
     name: unit tests
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Build docker image
@@ -38,7 +38,7 @@ jobs:
 
   test_zmq:
     name: zmq
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Build docker image
@@ -52,7 +52,7 @@ jobs:
 
   test_msgq:
     name: msgq
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Build docker image
@@ -66,7 +66,7 @@ jobs:
 
   static_analysis:
     name: static analysis
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Build docker image
diff --git a/Dockerfile b/Dockerfile
index 42fdbf0..10e446d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
     autoconf \
     build-essential \
diff --git a/SConscript b/SConscript
index 0ab943d..c0ade46 100644
--- a/SConscript
+++ b/SConscript
@@ -2,6 +2,7 @@ Import('env', 'arch', 'zmq', 'cython_dependencies')
 
 import shutil
 
+cereal_dir = Dir('.')
 gen_dir = Dir('gen')
 messaging_dir = Dir('messaging')
 
@@ -9,12 +10,12 @@ messaging_dir = Dir('messaging')
 env.Command(["gen/c/include/c++.capnp.h", "gen/c/include/java.capnp.h"], [], "mkdir -p " + gen_dir.path + "/c/include && touch $TARGETS")
 env.Command(['gen/cpp/car.capnp.c++', 'gen/cpp/log.capnp.c++', 'gen/cpp/car.capnp.h', 'gen/cpp/log.capnp.h'],
             ['car.capnp', 'log.capnp'],
-            'capnpc $SOURCES --src-prefix=cereal -o c++:' + gen_dir.path + '/cpp/')
+            f"capnpc --src-prefix={cereal_dir.path} $SOURCES -o c++:{gen_dir.path}/cpp/")
 
 if shutil.which('capnpc-java'):
   env.Command(['gen/java/Car.java', 'gen/java/Log.java'],
               ['car.capnp', 'log.capnp'],
-              'capnpc $SOURCES --src-prefix=cereal -o java:' + gen_dir.path + '/java/')
+              f"capnpc $SOURCES --src-prefix={cereal_dir.path} -o java:{gen_dir.path}/java/")
 
 # TODO: remove non shared cereal and messaging
 cereal_objects = env.SharedObject([
diff --git a/SConstruct b/SConstruct
index 2249d7a..e9de920 100644
--- a/SConstruct
+++ b/SConstruct
@@ -14,8 +14,8 @@ Export('cython_dependencies')
 cereal_dir = Dir('.')
 
 cpppath = [
-    cereal_dir,
-    '/usr/lib/include',
+  cereal_dir,
+  '/usr/lib/include',
 ]
 
 AddOption('--test',
@@ -47,7 +47,6 @@ env = Environment(
   CXXFLAGS="-std=c++1z",
   CPPPATH=cpppath,
 )
-
-
 Export('env', 'zmq', 'arch')
+
 SConscript(['SConscript'])