Skip to content

Commit

Permalink
github-ci: update commit and formatting containers
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jasonish authored and victorjulien committed Jan 28, 2022
1 parent 234a44b commit f8e1430
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ on:

permissions: read-all

env:
DEBIAN_FRONTEND: "noninteractive"

jobs:

check-commits:
name: Commit Check
runs-on: ubuntu-latest
container: ubuntu:18.04
container: ubuntu:20.04
steps:
- name: Caching ~/.cargo
uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed
Expand Down Expand Up @@ -43,7 +46,7 @@ jobs:
libhiredis-dev \
libjansson-dev \
libevent-dev \
libevent-pthreads-2.1.6 \
libevent-pthreads-2.1-7 \
libjansson-dev \
libpython2.7 \
libssl-dev \
Expand All @@ -68,6 +71,8 @@ jobs:
curl -OL https://github.com/eqrion/cbindgen/releases/download/v0.15.0/cbindgen
chmod 755 cbindgen
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
with:
fetch-depth: 0
- run: git fetch
- run: git clone https://github.com/OISF/libhtp -b 0.5.x
- name: Building all commits
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ on:

permissions: read-all

env:
DEBIAN_FRONTEND: "noninteractive"

jobs:

# Checking for correct formatting of branch for C code changes
check-formatting:
name: Formatting Check (clang 9)
runs-on: ubuntu-18.04
container: ubuntu:18.04
runs-on: ubuntu-20.04
container: ubuntu:20.04
continue-on-error: true
steps:

Expand Down Expand Up @@ -83,6 +86,8 @@ jobs:
# action to manually fix this up.
- name: Checkout - might be merge commit!
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
with:
fetch-depth: 0
# Use last commit of branch, not potential merge commit!
#
# This works perfectly well on pull requests within forked repos, but
Expand Down

0 comments on commit f8e1430

Please sign in to comment.