[PATCH 1/2] ci: Fix newt download

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

The upstream server is no longer offering tarballs. Fetch and checkout
the git repo instead. To avoid pulling from this server over and over
again, cache the repo from the beginning.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
.github/actions/perform-tests/action.yml | 18 ++++++++++++------
.github/workflows/next.yml | 3 +--
2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/actions/perform-tests/action.yml b/.github/actions/perform-tests/action.yml
index d442d00..0344ed1 100644
--- a/.github/actions/perform-tests/action.yml
+++ b/.github/actions/perform-tests/action.yml
@@ -16,16 +16,22 @@ runs:
run: |
# install kas to have all kas dependencies:
pip install .[test]
+ - name: Cache newt
+ id: cache-newt
+ uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+ with:
+ path: |
+ newt
+ key: cache-newt-${{ env.NEWT_REVISION }}
- name: Install python-newt
shell: bash
run: |
sudo apt-get update
- sudo apt-get install libpopt-dev libslang2-dev
- wget -q https://releases.pagure.org/newt/newt-$NEWT_VERSION.tar.gz
- echo "$NEWT_SHA256 newt-$NEWT_VERSION.tar.gz" | sha256sum -c
- tar -C /tmp -xzf newt-$NEWT_VERSION.tar.gz
- cd /tmp/newt-$NEWT_VERSION
- autoconf
+ sudo apt-get install libpopt-dev libslang2-dev gettext
+ [ -d newt ] || git clone https://pagure.io/newt.git
+ cd newt
+ git checkout $NEWT_REVISION
+ autoreconf -fi
./configure --with-python=python${{ matrix.python-version }}
make -j $(nproc)
sudo make install
diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml
index 4a1405f..7dd84e3 100644
--- a/.github/workflows/next.yml
+++ b/.github/workflows/next.yml
@@ -10,8 +10,7 @@ on:
env:
SHELLCHECK_VERSION: v0.10.0
SHELLCHECK_SHA256: 6c881ab0698e4e6ea235245f22832860544f17ba386442fe7e9d629f8cbedf87
- NEWT_VERSION: 0.52.24
- NEWT_SHA256: 5ded7e221f85f642521c49b1826c8de19845aa372baf5d630a51774b544fbdbb
+ NEWT_REVISION: 5f2762040505edd7a25878fe27a00a2d34485663 # r0.52.24

jobs:
codestyle:
--
2.47.3

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

Requires preserve PATH so that install will find the versioned python
binary. In turn, we can drop the no longer needed snack package links
because the installation is now performed into the right directory.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

.github/actions/perform-tests/action.yml | 6 +-----
.github/workflows/next.yml | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/actions/perform-tests/action.yml b/.github/actions/perform-tests/action.yml
index 0344ed1..1bcf708 100644
--- a/.github/actions/perform-tests/action.yml
+++ b/.github/actions/perform-tests/action.yml
@@ -34,11 +34,7 @@ runs:

autoreconf -fi
./configure --with-python=python${{ matrix.python-version }}
make -j $(nproc)

- sudo make install
- ln -s /usr/local/lib/python${{ matrix.python-version }}/site-packages/_snack.so \
- $(python3 -c 'import site; print(site.getsitepackages()[0])')/
- ln -s /usr/local/lib/python${{ matrix.python-version }}/site-packages/snack.py \
- $(python3 -c 'import site; print(site.getsitepackages()[0])')/
+ sudo --preserve-env=PATH make install
- name: Run offline tests
shell: bash
env:
diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml
index 7dd84e3..3cf8b4d 100644
--- a/.github/workflows/next.yml
+++ b/.github/workflows/next.yml
@@ -10,7 +10,7 @@ on:

env:
SHELLCHECK_VERSION: v0.10.0
SHELLCHECK_SHA256: 6c881ab0698e4e6ea235245f22832860544f17ba386442fe7e9d629f8cbedf87

- NEWT_REVISION: 5f2762040505edd7a25878fe27a00a2d34485663 # r0.52.24
+ NEWT_REVISION: 9b9e7e8936f51f83a7259c5f0a9b4ff909cbd39a # r0.52.25

jobs:
codestyle:
--
2.47.3