Skip to content

Commit bf71992

Browse files
committed
test-NIT.sh, .github/workflows/04-maven-nit.yml: default to DO_USE_NUTCI_CACHE=yes in CI and developer runs [networkupstools/nut#3109]
Signed-off-by: Jim Klimov <jimklimov@gmail.com>
1 parent 15b56ea commit bf71992

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

.github/workflows/04-maven-nit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ jobs:
9595
with:
9696
path: |
9797
~/nit.sh.bak
98+
~/.cache/nut-ci
9899
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/.timestamp-init') }}
99100
restore-keys: |
100101
${{ runner.os }}-build-${{ env.cache-name }}-
@@ -104,4 +105,4 @@ jobs:
104105
- if: matrix.os == 'ubuntu-latest'
105106
name: Test jNut with NIT
106107
run: |
107-
PATH="${HOME}:${PATH}" ./test-NIT.sh
108+
DO_USE_NUTCI_CACHE=yes PATH="${HOME}:${PATH}" ./test-NIT.sh

test-NIT.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
# not so much general NUT_DEBUG_LEVEL that would add noise from drivers:
3131
[ -n "${NUT_DEBUG_LEVEL_UPSD}" ] || NUT_DEBUG_LEVEL_UPSD=6
3232

33+
# Re-use test certificates if we can, focus on jNut testing:
34+
[ -n "${DO_USE_NUTCI_CACHE-}" ] || DO_USE_NUTCI_CACHE=yes
35+
export DO_USE_NUTCI_CACHE
36+
3337
# Normalize incoming paths, e.g. avoid `~` chars for home-dir builds if we can:
3438
if [ -n "${NUT_BUILDDIR-}" ] ; then
3539
D="`cd \"${NUT_BUILDDIR}\" && pwd`" && NUT_BUILDDIR="$D"

0 commit comments

Comments
 (0)