]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
ci: drop py2 lxml, pull in jinja2
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 17 May 2021 08:36:30 +0000 (10:36 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 19 May 2021 01:25:26 +0000 (10:25 +0900)
.github/workflows/build_test.sh
.github/workflows/mkosi.yml
.lgtm.yml
.semaphore/semaphore-runner.sh

index 8471ea181ea672c17c1ba51bc78fb457ebd34d4e..bdcb71ba9c050fec34fee8e448681a786d93654d 100755 (executable)
@@ -46,9 +46,9 @@ PACKAGES=(
     mount
     net-tools
     perl
-    python-lxml
     python3-evdev
     python3-lxml
+    python3-jinja2
     python3-pip
     python3-pyparsing
     python3-setuptools
index 2c9630dec894a6e7fe0942d4fc5784b98223fcc7..c7508a5bd9199d213181a6d9463adfdeda10948e 100644 (file)
@@ -27,7 +27,7 @@ jobs:
     - uses: systemd/mkosi@v9
 
     - name: Install
-      run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect
+      run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect python3-jinja2
 
     - name: Symlink
       run: ln -s .mkosi/mkosi.${{ matrix.distro }} mkosi.default
index 79512df980568acc59bd0b61ae390ecd9074d0b0..93f8b1c0f471a9e642595a3ee869a5be67c22343 100644 (file)
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -9,6 +9,7 @@ extraction:
         - libfdisk-dev
         - libp11-kit-dev
         - libssl-dev
+        - python3-jinja2
   python:
     python_setup:
       version: 3
index a21d5d88e0710dc1cca875c664271950470ea60a..e7dbcb2ac1ad1df6184225eee1b4213d61cdc793 100755 (executable)
@@ -57,7 +57,7 @@ for phase in "${PHASES[@]}"; do
             echo "deb http://archive.ubuntu.com/ubuntu $UBUNTU_RELEASE-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/backports.list
             sudo apt-get -q update
             sudo apt-get install -y -t "$UBUNTU_RELEASE-backports" lxc
-            sudo apt-get install -y python3-debian git dpkg-dev fakeroot
+            sudo apt-get install -y python3-debian git dpkg-dev fakeroot python3-jinja2
 
             [ -d $AUTOPKGTEST_DIR ] || git clone --quiet --depth=1 https://salsa.debian.org/ci-team/autopkgtest.git "$AUTOPKGTEST_DIR"