diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ee30f255..1f079dbb0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -205,7 +205,17 @@ jobs: export NODEJS_FILENAME=${{ steps.download-nodejs.outputs.NODEJS_FILENAME }} export NODEJS_SHA256=${{ steps.download-nodejs.outputs.NODEJS_SHA256 }} export NGHTTP3_FILENAME=${{ steps.download-nghttp3.outputs.NGHTTP3_FILENAME }} - export NGHTTP3_SHA256=${{ steps.download-nghttp3.outputs.NGHTTP3_SHA256 }} + if [ -z "${API_VERSION}" ] || + [ -z "${API_MD5}" ] || + [ -z "${API_SHA256}" ] || + [ -z "${NODEJS_FILENAME}" ] || + [ -z "${NODEJS_SHA256}" ] || + [ -z "${NGHTTP3_FILENAME}" ] || + [ -z "${NGHTTP3_SHA256}" ]; then + echo "Error: One or more required variables are not set." + exit 1 + fi + bash ./pkg_build.sh s ${{github.event.pull_request.number}} bash ./pkg_build.sh p - name: Upload binary txz and plg to Github artifacts diff --git a/plugin/source/dynamix.unraid.net/pkg_build.sh b/plugin/source/dynamix.unraid.net/pkg_build.sh index 0840728f7..76ee5c1cf 100755 --- a/plugin/source/dynamix.unraid.net/pkg_build.sh +++ b/plugin/source/dynamix.unraid.net/pkg_build.sh @@ -51,20 +51,20 @@ cd "${DIR}" || exit 1 PLUGIN_URL="https://stable.dl.unraid.net/unraid-api/\&name;.plg" MAIN_TXZ="https://stable.dl.unraid.net/unraid-api/${plugin}-${version}.txz" API_TGZ="https://stable.dl.unraid.net/unraid-api/unraid-api-${API_VERSION}.tgz" -NODE_TGZ="https://stable.dl.unraid.net/unraid-api/${NODEJS_FILENAME}" +NODE_TXZ="https://stable.dl.unraid.net/unraid-api/${NODEJS_FILENAME}" NGHTTP3_TGZ="https://stable.dl.unraid.net/unraid-api/${NGHTTP3_FILENAME}" # Check if PR is set, use a different path if so if [[ -n "${PR}" ]]; then MAIN_TXZ="https://preview.dl.unraid.net/unraid-api/pr/${PR}/${plugin}-${version}.txz" API_TGZ="https://preview.dl.unraid.net/unraid-api/pr/${PR}/unraid-api-${API_VERSION}.tgz" PLUGIN_URL="https://preview.dl.unraid.net/unraid-api/pr/${PR}/${plugin}.plg" - NODE_TGZ="https://preview.dl.unraid.net/unraid-api/pr/${PR}/${NODEJS_FILENAME}" + NODE_TXZ="https://preview.dl.unraid.net/unraid-api/pr/${PR}/${NODEJS_FILENAME}" NGHTTP3_TGZ="https://preview.dl.unraid.net/unraid-api/pr/${PR}/${NGHTTP3_FILENAME}" elif [[ "${env}" == "staging" ]]; then PLUGIN_URL="https://preview.dl.unraid.net/unraid-api/\&name;.plg" MAIN_TXZ="https://preview.dl.unraid.net/unraid-api/${plugin}-${version}.txz" API_TGZ="https://preview.dl.unraid.net/unraid-api/unraid-api-${API_VERSION}.tgz" - NODE_TGZ="https://preview.dl.unraid.net/unraid-api/${NODEJS_FILENAME}" + NODE_TXZ="https://preview.dl.unraid.net/unraid-api/${NODEJS_FILENAME}" NGHTTP3_TGZ="https://preview.dl.unraid.net/unraid-api/${NGHTTP3_FILENAME}" fi @@ -80,12 +80,12 @@ sed -i -E "s#(ENTITY MAIN_TXZ\s*)\".*\"#\1\"${MAIN_TXZ}\"#g" "${plgfile}" sed -i -E "s#(ENTITY API_TGZ\s*)\".*\"#\1\"${API_TGZ}\"#g" "${plgfile}" # update node versions -sed -i -E "s#(ENTITY NODE\s*)\".*\"#\1\"${NODEJS_FILENAME}\"#g" "${plgfile}" -sed -i -E "s#(ENTITY NODE_SHA256\s*)\".*\"#\1\"${NODEJS_SHA256}\"#g" "${plgfile}" -sed -i -E "s#(ENTITY NODE_TXZ\s*)\".*\"#\1\"${NODE_TGZ}\"#g" "${plgfile}" +sed -i -E "s#(ENTITY NODEJS_FILENAME\s*)\".*\"#\1\"${NODEJS_FILENAME}\"#g" "${plgfile}" +sed -i -E "s#(ENTITY NODEJS_SHA256\s*)\".*\"#\1\"${NODEJS_SHA256}\"#g" "${plgfile}" +sed -i -E "s#(ENTITY NODE_TXZ\s*)\".*\"#\1\"${NODE_TXZ}\"#g" "${plgfile}" # update nghttp3 versions -sed -i -E "s#(ENTITY NGHTTP3\s*)\".*\"#\1\"${NGHTTP3_FILENAME}\"#g" "${plgfile}" +sed -i -E "s#(ENTITY NGHTTP3_FILENAME\s*)\".*\"#\1\"${NGHTTP3_FILENAME}\"#g" "${plgfile}" sed -i -E "s#(ENTITY NGHTTP3_SHA256\s*)\".*\"#\1\"${NGHTTP3_SHA256}\"#g" "${plgfile}" sed -i -E "s#(ENTITY NGHTTP3_TXZ\s*)\".*\"#\1\"${NGHTTP3_TGZ}\"#g" "${plgfile}"