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.
pull/4444/head
Jason Ish 7 years ago
parent 3d9071639b
commit b9515671be

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

Loading…
Cancel
Save