mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

cache-domains: added pre-test.sh CI step 

Some packages variants have conflicting dependencies with the
base packages and the CI test will fail to install before anything
can be done by the packages to setup the system for install.

This change adds a pre-test.sh that runs before the install so things
like the default libustream variant can be swapped out as shown in the
updated cache-domains.

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
This commit is contained in:
Gerard Ryan 2023-04-29 16:25:49 +10:00 committed by Rosen Penev
parent 10ac45abb7
commit 7dd26ee760
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/entrypoint.sh vendored
View File

@ -26,10 +26,24 @@ for PKG in /ci/*.ipk; do
echo "Testing package $PKG_NAME in version $PKG_VERSION from $PKG_SOURCE"
opkg install "$PKG"
export PKG_NAME PKG_VERSION CI_HELPER
PRE_TEST_SCRIPT=$(find /ci/ -name "$PKG_SOURCE" -type d)/pre-test.sh
if [ -f "$PRE_TEST_SCRIPT" ]; then
echo "Use package specific pre-test.sh"
if sh "$PRE_TEST_SCRIPT" "$PKG_NAME" "$PKG_VERSION"; then
echo "Pre-test successful"
else
echo "Pre-test failed"
exit 1
fi
else
echo "No pre-test.sh script available"
fi
opkg install "$PKG"
TEST_SCRIPT=$(find /ci/ -name "$PKG_SOURCE" -type d)/test.sh
if [ -f "$TEST_SCRIPT" ]; then

2
utils/cache-domains/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cache-domains
PKG_VERSION:=2.3.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>

24
utils/cache-domains/pre-test.sh Executable file
View File

@ -0,0 +1,24 @@
#! /bin/sh
set -o errexit
case "${PKG_NAME}" in
cache-domains-openssl)
LIBUSTREAM_DEPS="libustream-openssl libopenssl3"
LIBUSTREAM_DEPS="${LIBUSTREAM_DEPS} libatomic1" # arm_cortex-a15_neon-vfpv4 extra dep
;;
cache-domains-mbedtls)
LIBUSTREAM_DEPS="libustream-mbedtls libmbedtls"
;;
cache-domains-wolfssl)
LIBUSTREAM_DEPS="libustream-wolfssl libwolfssl"
;;
esac
# Replace the current libustream with the one PKG_NAME depends on.
# opkg depends on libustream for https so we need to download the
# replacement first and replace it offline.
opkg download ${LIBUSTREAM_DEPS}
opkg remove 'libustream-*'
opkg install --offline-root / ./*.ipk
rm ./*.ipk