Skip to content

Commit e62deab

Browse files
committed
github-ci: update debian/ubuntu minimal build to use dist
Update the Ubuntu/Debian minimal recommended build to use the pre-built dist archive instead of building from git, as that is the type of build this documentation targets. Also use the ubuntu:22.04 container. The GitHub provided Ubuntu 22.04 VM appears to contain some new additions like a newer Rust that is not found on a typical Ubuntu 22.04 installation. (cherry picked from commit a07eb6b)
1 parent 6af634b commit e62deab

2 files changed

Lines changed: 12 additions & 19 deletions

File tree

.github/workflows/builds.yml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2514,8 +2514,9 @@ jobs:
25142514

25152515
ubuntu-22-04-minimal-recommended-build:
25162516
name: Ubuntu 22.04 (Minimal/Recommended Build)
2517-
needs: [prepare-deps, prepare-cbindgen]
2517+
needs: [ubuntu-22-04-dist]
25182518
runs-on: ubuntu-22.04
2519+
container: ubuntu:22.04
25192520
steps:
25202521
# Cache Rust stuff.
25212522
- name: Cache cargo registry
@@ -2527,23 +2528,15 @@ jobs:
25272528
- name: Determine number of CPUs
25282529
run: echo CPUS=$(nproc --all) >> $GITHUB_ENV
25292530

2530-
- name: Install git dependencies
2531-
run: |
2532-
sudo apt update
2533-
sudo apt -y install \
2534-
git \
2535-
libtool
2536-
2537-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
2538-
- run: git config --global --add safe.directory /__w/suricata/suricata
2539-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
2531+
- name: Download suricata.tar.gz
2532+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
25402533
with:
2541-
name: prep
2542-
path: prep
2543-
- run: tar xf prep/suricata-update.tar.gz
2544-
- run: tar xf prep/suricata-verify.tar.gz
2545-
- run: ./autogen.sh
2546-
2534+
name: dist
2535+
- run: tar xvf suricata-*.tar.gz --strip-components=1
2536+
2537+
# Install packages required by the install script.
2538+
- run: apt update -y && apt install -y sudo
2539+
25472540
- name: Install minimal dependencies
25482541
run: ./scripts/docs-ubuntu-debian-minimal-build.sh
25492542

scripts/docs-ubuntu-debian-minimal-build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
# install-guide-documentation tag start: Minimal dependencies
66
sudo apt -y install autoconf automake build-essential cargo \
7-
cbindgen libjansson-dev libpcap-dev libpcre2-dev libtool \
7+
libjansson-dev libpcap-dev libpcre2-dev libtool \
88
libyaml-dev make pkg-config rustc zlib1g-dev
9-
# install-guide-documentation tag end: Minimal dependencies
9+
# install-guide-documentation tag end: Minimal dependencies

0 commit comments

Comments
 (0)