github-ci: update commit and formatting containers

Update the Ubuntu containers for the commit and formatting checks to
Ubuntu 20.04.

The latest version of the checkout action requires git v2.18 in order to
checkout the code as a git repo, which is required for these workflows.

With older versions of git the action will download the code as a
tarball and lack the .git directory.
pull/6894/head
Jason Ish 4 years ago committed by Victor Julien
parent 234a44bf85
commit f8e143030c

@ -5,12 +5,15 @@ on:
permissions: read-all permissions: read-all
env:
DEBIAN_FRONTEND: "noninteractive"
jobs: jobs:
check-commits: check-commits:
name: Commit Check name: Commit Check
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: ubuntu:18.04 container: ubuntu:20.04
steps: steps:
- name: Caching ~/.cargo - name: Caching ~/.cargo
uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed
@ -43,7 +46,7 @@ jobs:
libhiredis-dev \ libhiredis-dev \
libjansson-dev \ libjansson-dev \
libevent-dev \ libevent-dev \
libevent-pthreads-2.1.6 \ libevent-pthreads-2.1-7 \
libjansson-dev \ libjansson-dev \
libpython2.7 \ libpython2.7 \
libssl-dev \ libssl-dev \
@ -68,6 +71,8 @@ jobs:
curl -OL https://github.com/eqrion/cbindgen/releases/download/v0.15.0/cbindgen curl -OL https://github.com/eqrion/cbindgen/releases/download/v0.15.0/cbindgen
chmod 755 cbindgen chmod 755 cbindgen
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
with:
fetch-depth: 0
- run: git fetch - run: git fetch
- run: git clone https://github.com/OISF/libhtp -b 0.5.x - run: git clone https://github.com/OISF/libhtp -b 0.5.x
- name: Building all commits - name: Building all commits

@ -10,13 +10,16 @@ on:
permissions: read-all permissions: read-all
env:
DEBIAN_FRONTEND: "noninteractive"
jobs: jobs:
# Checking for correct formatting of branch for C code changes # Checking for correct formatting of branch for C code changes
check-formatting: check-formatting:
name: Formatting Check (clang 9) name: Formatting Check (clang 9)
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
container: ubuntu:18.04 container: ubuntu:20.04
continue-on-error: true continue-on-error: true
steps: steps:
@ -83,6 +86,8 @@ jobs:
# action to manually fix this up. # action to manually fix this up.
- name: Checkout - might be merge commit! - name: Checkout - might be merge commit!
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
with:
fetch-depth: 0
# Use last commit of branch, not potential merge commit! # Use last commit of branch, not potential merge commit!
# #
# This works perfectly well on pull requests within forked repos, but # This works perfectly well on pull requests within forked repos, but

Loading…
Cancel
Save