From 52178a99e51f470eb0d3e497a6fd6d65aeae323a Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Wed, 19 Feb 2025 19:16:14 +0100 Subject: [PATCH] Install libjansson-dev at build time instead of run time --- .github/workflows/test-devel.yml | 48 +++++++++++----------- .github/workflows/test-devel_release.yml | 6 +-- .github/workflows/test-stable.yml | 52 ++++++++++++------------ make_workflows.py | 2 +- workflows.yml | 3 ++ 5 files changed, 59 insertions(+), 52 deletions(-) diff --git a/.github/workflows/test-devel.yml b/.github/workflows/test-devel.yml index 7eb9659..e0eb55c 100644 --- a/.github/workflows/test-devel.yml +++ b/.github/workflows/test-devel.yml @@ -120,6 +120,8 @@ jobs: path: ircd-hybrid ref: 8.2.x repository: ircd-hybrid/ircd-hybrid + - name: Install system dependencies + run: sudo apt-get install atheme-services faketime libjansson-dev - name: Build Hybrid run: | cd $GITHUB_WORKSPACE/ircd-hybrid/ @@ -448,7 +450,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -489,7 +491,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -524,7 +526,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -566,7 +568,7 @@ jobs: make build make install - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -607,7 +609,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -642,7 +644,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -683,7 +685,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -724,7 +726,7 @@ jobs: make -j 4 make install - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -754,7 +756,7 @@ jobs: run: pip install git+https://github.com/progval/Limnoria.git@master cryptography pyxmpp2-scram - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -794,7 +796,7 @@ jobs: make install cp $GITHUB_WORKSPACE/data/nefarious/* $HOME/.local/lib - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -829,7 +831,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -870,7 +872,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -905,7 +907,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -946,7 +948,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -995,7 +997,7 @@ jobs: cd $GITHUB_WORKSPACE/sable/ cargo build - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1030,7 +1032,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1059,7 +1061,7 @@ jobs: - name: Install dependencies run: pip install git+https://github.com/sopel-irc/sopel.git - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1099,7 +1101,7 @@ jobs: mkdir -p ~/.local/bin/ ln -s $(pwd)/index.js ~/.local/bin/thelounge - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1134,7 +1136,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1169,7 +1171,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1210,7 +1212,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1245,7 +1247,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1291,7 +1293,7 @@ jobs: wget -q https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar wget -q https://wordpress.org/latest.zip -O wordpress-latest.zip - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip diff --git a/.github/workflows/test-devel_release.yml b/.github/workflows/test-devel_release.yml index 08bd05d..bd16715 100644 --- a/.github/workflows/test-devel_release.yml +++ b/.github/workflows/test-devel_release.yml @@ -121,7 +121,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -162,7 +162,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -197,7 +197,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml index ec6e389..0720873 100644 --- a/.github/workflows/test-stable.yml +++ b/.github/workflows/test-stable.yml @@ -161,6 +161,8 @@ jobs: path: ircd-hybrid ref: 8.2.39 repository: ircd-hybrid/ircd-hybrid + - name: Install system dependencies + run: sudo apt-get install atheme-services faketime libjansson-dev - name: Build Hybrid run: | cd $GITHUB_WORKSPACE/ircd-hybrid/ @@ -491,7 +493,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -532,7 +534,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -567,7 +569,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -602,7 +604,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -644,7 +646,7 @@ jobs: make build make install - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -685,7 +687,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -720,7 +722,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -761,7 +763,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -796,7 +798,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -848,7 +850,7 @@ jobs: mkdir -p $HOME/.local/bin cp $HOME/.local/sbin/ircd $HOME/.local/bin/ircd - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -889,7 +891,7 @@ jobs: make -j 4 make install - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -918,7 +920,7 @@ jobs: - name: Install dependencies run: pip install limnoria==2023.5.27 cryptography pyxmpp2-scram - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -958,7 +960,7 @@ jobs: make install cp $GITHUB_WORKSPACE/data/nefarious/* $HOME/.local/lib - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -993,7 +995,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1034,7 +1036,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1069,7 +1071,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1110,7 +1112,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1159,7 +1161,7 @@ jobs: cd $GITHUB_WORKSPACE/sable/ cargo build - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1194,7 +1196,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1223,7 +1225,7 @@ jobs: - name: Install dependencies run: pip install sopel==7.1.8 - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1263,7 +1265,7 @@ jobs: mkdir -p ~/.local/bin/ ln -s $(pwd)/index.js ~/.local/bin/thelounge - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1298,7 +1300,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1333,7 +1335,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1374,7 +1376,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip @@ -1409,7 +1411,7 @@ jobs: - name: Unpack artefacts run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; - name: Install system dependencies - run: sudo apt-get install atheme-services faketime libjansson-dev + run: sudo apt-get install atheme-services faketime - name: Install irctest dependencies run: |- python -m pip install --upgrade pip diff --git a/make_workflows.py b/make_workflows.py index a6d1a42..9335ec2 100644 --- a/make_workflows.py +++ b/make_workflows.py @@ -206,7 +206,7 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs): *install_steps, { "name": "Install system dependencies", - "run": "sudo apt-get install atheme-services faketime libjansson-dev", + "run": "sudo apt-get install atheme-services faketime", }, { "name": "Install irctest dependencies", diff --git a/workflows.yml b/workflows.yml index 83bc4b1..1e79fa8 100644 --- a/workflows.yml +++ b/workflows.yml @@ -33,6 +33,9 @@ software: devel: "8.2.x" devel_release: null path: ircd-hybrid + pre_deps: + - name: "Install system dependencies" + run: "sudo apt-get install atheme-services faketime libjansson-dev" separate_build_job: true build_script: | cd $GITHUB_WORKSPACE/ircd-hybrid/