diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-17 10:36:30 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-19 10:25:26 +0900 |
| commit | 392ed18542a1b2cae507c82bc48ddffb4f254e01 (patch) | |
| tree | b04bd9a061d016c8e81536fd8627cdded11dc454 | |
| parent | 71ae5ce544f5ec8ec9856d930cbca6b3a5a7a3bf (diff) | |
| download | systemd-392ed18542a1b2cae507c82bc48ddffb4f254e01.tar.gz | |
ci: drop py2 lxml, pull in jinja2
| -rwxr-xr-x | .github/workflows/build_test.sh | 2 | ||||
| -rw-r--r-- | .github/workflows/mkosi.yml | 2 | ||||
| -rw-r--r-- | .lgtm.yml | 1 | ||||
| -rwxr-xr-x | .semaphore/semaphore-runner.sh | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index 8471ea181e..bdcb71ba9c 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -46,9 +46,9 @@ PACKAGES=( mount net-tools perl - python-lxml python3-evdev python3-lxml + python3-jinja2 python3-pip python3-pyparsing python3-setuptools diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 2c9630dec8..c7508a5bd9 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -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 @@ -9,6 +9,7 @@ extraction: - libfdisk-dev - libp11-kit-dev - libssl-dev + - python3-jinja2 python: python_setup: version: 3 diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh index a21d5d88e0..e7dbcb2ac1 100755 --- a/.semaphore/semaphore-runner.sh +++ b/.semaphore/semaphore-runner.sh @@ -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" |