From 904a274188668a47041d41d77a43dc4d85e6b0a1 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 10 Sep 2023 20:10:54 +0000 Subject: [PATCH] Attempt no. 2 at fixing publishing whith dependent packages --- .github/actions/build.sh | 9 +++++++-- .github/workflows/build.yml | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/actions/build.sh b/.github/actions/build.sh index 0c6e3082062..0e379a6031c 100755 --- a/.github/actions/build.sh +++ b/.github/actions/build.sh @@ -66,8 +66,13 @@ do echo >build.log if [ "${GH_ARCH%%-*}" != "noarch" ]; then - echo "$ make ${MAKE_ARGS}arch-${GH_ARCH%%-*}-${GH_ARCH##*-} -C ./spk/${package}" >>build.log - make ${MAKE_ARGS}arch-${GH_ARCH%%-*}-${GH_ARCH##*-} -C ./spk/${package} |& tee >(tail -15 >>build.log) + if [ "${package}" == "${PACKAGE_TO_PUBLISH}" ]; then + echo "$ make ${MAKE_ARGS}arch-${GH_ARCH%%-*}-${GH_ARCH##*-} -C ./spk/${package}" >>build.log + make ${MAKE_ARGS}arch-${GH_ARCH%%-*}-${GH_ARCH##*-} -C ./spk/${package} |& tee >(tail -15 >>build.log) + else + echo "$ make arch-${GH_ARCH%%-*}-${GH_ARCH##*-} -C ./spk/${package}" >>build.log + make arch-${GH_ARCH%%-*}-${GH_ARCH##*-} -C ./spk/${package} |& tee >(tail -15 >>build.log) + fi else if [ "${GH_ARCH}" = "noarch" ]; then TCVERSION= diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1455f2bd6a4..dadeb38672d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -113,6 +113,7 @@ jobs: NOARCH_PACKAGES: ${{ needs.prepare.outputs.noarch_packages }} PUBLISH: ${{ github.event.inputs.publish }} API_KEY: ${{ secrets.PUBLISH_API_KEY }} + PACKAGE_TO_PUBLISH: ${{ github.event.inputs.package }} # https://github.com/SynoCommunity/spksrc/wiki/Compile-and-build-rules GH_ARCH: ${{ matrix.arch }} BUILD_ERROR_FILE: /github/workspace/build_errors.txt