fix(ci): raspbian arch is arm, not arm64
This commit is contained in:
parent
e874ec2b36
commit
ba6d4e4a19
|
@ -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(){
|
||||
|
|
|
@ -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 }}
|
||||
|
|
2
build
2
build
|
@ -31,7 +31,7 @@ case "$ARCH" in
|
|||
ARCH='arm64'
|
||||
;;
|
||||
arm*)
|
||||
ARCH=arm
|
||||
ARCH='arm64'
|
||||
;;
|
||||
esac
|
||||
export ARCH
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue