From 84b913d24011e534bea04f81880e72bf0d1eece8 Mon Sep 17 00:00:00 2001 From: Wu Yufei Date: Thu, 12 Nov 2020 23:06:51 +0800 Subject: [PATCH] Update CI scripts --- .github/workflows/packaging.yml | 4 +++ build/build.sh | 47 ++++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 583583a..1d1b6f6 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -18,6 +18,10 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: '^3.7' # request python 3.7+ for datetime.datetime.fromisoformat + - name: Build Packages run: | cd build diff --git a/build/build.sh b/build/build.sh index 7d1f11c..36e26ba 100755 --- a/build/build.sh +++ b/build/build.sh @@ -6,17 +6,46 @@ fail() { echo -e "\033[31mERROR: Failed to build $1\033[0m" 1>&2 } -pushd rpm > /dev/null -./build.sh $VERSION || fail 'RPM package' -popd > /dev/null +if [[ $# -gt 0 ]]; then + for arg in $*; do + case $arg in + rpm) + USE_RPM=1 + ;; + debian) + USE_DEB=1 + ;; + openwrt) + USE_OPK=1 + ;; + *) + echo "Invalid package $arg" + exit 1 + esac + done +else + USE_RPM=1 + USE_DEB=1 + USE_OPK=1 +fi -pushd debian > /dev/null -./build.sh $VERSION || fail 'Debian package' -popd > /dev/null +if [[ ! -z $USE_RPM ]]; then + pushd rpm > /dev/null + ./build.sh $VERSION || fail 'RPM package' + popd > /dev/null +fi -pushd openwrt > /dev/null -./build.sh $VERSION || fail 'OpenWrt package' -popd > /dev/null +if [[ ! -z $USE_DEB ]]; then + pushd debian > /dev/null + ./build.sh $VERSION || fail 'Debian package' + popd > /dev/null +fi + +if [[ ! -z $USE_OPK ]]; then + pushd openwrt > /dev/null + ./build.sh $VERSION || fail 'OpenWrt package' + popd > /dev/null +fi echo -ne "\033[0;32m" find . -regextype posix-egrep -regex ".*\.(opk|deb|rpm)$"