diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh index afdb4f83e..8b2c0d43a 100755 --- a/.ci/build_packages/tests.sh +++ b/.ci/build_packages/tests.sh @@ -20,6 +20,7 @@ esac PACKAGE_NAME="${1}" PACKAGE_TYPE="${2}" +ARCH="${3}" export DEBUG=1 export CODE_PATH=${CODE_PATH:-"/emqx"} @@ -48,17 +49,20 @@ if ! [ -f "$PACKAGE_FILE" ]; then exit 1 fi -case "$(uname -m)" in +if [ -z "$ARCH" ] +then + case "$(uname -m)" in x86_64) - ARCH='amd64' - ;; + ARCH='amd64' + ;; aarch64) - ARCH='arm64' - ;; + ARCH='arm64' + ;; arm*) - ARCH=arm - ;; -esac + ARCH=arm + ;; + esac +fi export ARCH emqx_prepare(){ diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index cebec25a1..de74f41de 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -74,7 +74,7 @@ jobs: - name: build and test tgz package run: | make ${EMQX_NAME}-tgz - .ci/build_packages/tests.sh "$EMQX_PKG_NAME" tgz + .ci/build_packages/tests.sh "$EMQX_PKG_NAME" tgz amd64 - name: run static checks if: contains(matrix.os, 'ubuntu') run: | @@ -82,11 +82,11 @@ jobs: - name: build and test deb/rpm packages run: | make ${EMQX_NAME}-pkg - .ci/build_packages/tests.sh "$EMQX_PKG_NAME" pkg + .ci/build_packages/tests.sh "$EMQX_PKG_NAME" pkg amd64 - name: build and test deb/rpm packages (Elixir) run: | make ${EMQX_NAME}-elixirpkg - .ci/build_packages/tests.sh "$EMQX_ELIXIRPKG_NAME" elixirpkg + .ci/build_packages/tests.sh "$EMQX_ELIXIRPKG_NAME" elixirpkg amd64 - uses: actions/upload-artifact@v2 with: name: ${{ matrix.profile}}-${{ matrix.otp }}-${{ matrix.os }} diff --git a/build b/build index 56dc3e2dd..67d9c120e 100755 --- a/build +++ b/build @@ -31,7 +31,7 @@ case "$ARCH" in ARCH='arm64' ;; arm*) - ARCH=arm + ARCH='arm64' ;; esac export ARCH diff --git a/scripts/buildx.sh b/scripts/buildx.sh index e341d7464..ae295dfdf 100755 --- a/scripts/buildx.sh +++ b/scripts/buildx.sh @@ -114,4 +114,4 @@ docker run -i --rm \ --platform="linux/$ARCH" \ -e EMQX_NAME="$PROFILE" \ "$BUILDER" \ - bash -euc "make ${PROFILE}-${PKGTYPE} && .ci/build_packages/tests.sh $PKG_NAME $PKGTYPE" + bash -euc "make ${PROFILE}-${PKGTYPE} && .ci/build_packages/tests.sh $PKG_NAME $PKGTYPE $ARCH"