From ad7272b162a89db8b97114cffe6feaf355881a05 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 28 Apr 2022 10:48:02 +0200 Subject: [PATCH] ci: get OS from builder image name cross build is running in container can not run docker in dokcer --- .github/workflows/build_packages.yaml | 3 --- scripts/buildx.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index c5f2928aa..4a5458fd4 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -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 diff --git a/scripts/buildx.sh b/scripts/buildx.sh index 358c72fee..ed8ab54a6 100755 --- a/scripts/buildx.sh +++ b/scripts/buildx.sh @@ -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}"