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:
commit
53df222c48
|
@ -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
|
||||
|
|
|
@ -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}"
|
||||
|
||||
|
|
Loading…
Reference in New Issue