From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 13 Dec 2019 15:14:35 +0000 (-0600)
Subject: github-ci: use container for 18.04 build
X-Git-Tag: suricata-5.0.2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9515671be598c89badf1fb5d2652497d493bcd3;p=thirdparty%2Fsuricata.git

github-ci: use container for 18.04 build

As the action runs natively on 18.04 we were not explicitly
setting a container, but this means we're using what GitHub
provides us as a default state which might be broken. Instead
use the standard Ubuntu 18.04 container.
---

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 10816074a8..4655280627 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -263,6 +263,7 @@ jobs:
   ubuntu-18-04:
     name: Ubuntu 18.04 (Cocci)
     runs-on: ubuntu-18.04
+    container: ubuntu:18.04
     steps:
 
       # Cache Rust stuff.
@@ -274,13 +275,15 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo apt update
-          sudo apt -y install \
+          apt update
+          apt -y install \
                 libpcre3 \
                 libpcre3-dev \
                 build-essential \
                 autoconf \
                 automake \
+                git \
+                jq \
                 libtool \
                 libpcap-dev \
                 libnet1-dev \
@@ -298,15 +301,18 @@ jobs:
                 libevent-dev \
                 libevent-pthreads-2.1.6 \
                 libjansson-dev \
+                libpython2.7 \
                 make \
                 parallel \
+                python3-yaml \
+                rustc \
                 software-properties-common \
                 zlib1g \
                 zlib1g-dev
       - name: Install Coccinelle
         run: |
-          sudo add-apt-repository -y ppa:npalix/coccinelle
-          sudo apt -y install coccinelle
+          add-apt-repository -y ppa:npalix/coccinelle
+          apt -y install coccinelle
       - uses: actions/checkout@v1
       - run: git clone https://github.com/OISF/libhtp -b 0.5.x
       - run: ./autogen.sh
@@ -318,7 +324,7 @@ jobs:
       - name: Fetching suricata-verify
         run: git clone https://github.com/OISF/suricata-verify.git
       - name: Running suricata-verify
-        run: ./suricata-verify/run.py
+        run: python3 ./suricata-verify/run.py
 
   # An Ubuntu 16.04 build using the tarball generated in the CentOS 8
   # build above.