Merge pull request #7818 from zmstone/0428-5.0-fix-cross-build-ci

ci: get OS from builder image name
This commit is contained in:
Zaiming (Stone) Shi 2022-04-28 10:22:37 +01:00 committed by GitHub
commit 53df222c48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions

View File

@ -324,10 +324,7 @@ jobs:
--profile "${PROFILE}" \
--pkgtype "${PKGTYPE}" \
--arch "${ARCH}" \
--otp "${OTP}" \
--elixir "${IsElixir}" \
--elixir-vsn "${ELIXIR}" \
--system "${SYSTEM}" \
--builder "ghcr.io/emqx/emqx-builder/5.0-10:${ELIXIR}-${OTP}-${SYSTEM}"
done
- uses: actions/upload-artifact@v1

View File

@ -118,7 +118,7 @@ else
fi
HOST_SYSTEM="$(./scripts/get-distro.sh)"
BUILDER_SYSTEM="$(docker run --rm -v "$(pwd)":/emqx "$BUILDER" /emqx/scripts/get-distro.sh)"
BUILDER_SYSTEM="$(echo "$BUILDER" | awk -F'-' '{print $NF}')"
CMD_RUN="make ${MAKE_TARGET} && ./scripts/pkg-tests.sh ${MAKE_TARGET}"