fix(ci): raspbian arch is arm, not arm64

This commit is contained in:
Thales Macedo Garitezi 2022-01-11 11:47:45 -03:00
parent e874ec2b36
commit ba6d4e4a19
No known key found for this signature in database
GPG Key ID: DD279F8152A9B6DD
4 changed files with 17 additions and 13 deletions

View File

@ -20,6 +20,7 @@ esac
PACKAGE_NAME="${1}" PACKAGE_NAME="${1}"
PACKAGE_TYPE="${2}" PACKAGE_TYPE="${2}"
ARCH="${3}"
export DEBUG=1 export DEBUG=1
export CODE_PATH=${CODE_PATH:-"/emqx"} export CODE_PATH=${CODE_PATH:-"/emqx"}
@ -48,17 +49,20 @@ if ! [ -f "$PACKAGE_FILE" ]; then
exit 1 exit 1
fi fi
case "$(uname -m)" in if [ -z "$ARCH" ]
then
case "$(uname -m)" in
x86_64) x86_64)
ARCH='amd64' ARCH='amd64'
;; ;;
aarch64) aarch64)
ARCH='arm64' ARCH='arm64'
;; ;;
arm*) arm*)
ARCH=arm ARCH=arm
;; ;;
esac esac
fi
export ARCH export ARCH
emqx_prepare(){ emqx_prepare(){

View File

@ -74,7 +74,7 @@ jobs:
- name: build and test tgz package - name: build and test tgz package
run: | run: |
make ${EMQX_NAME}-tgz 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 - name: run static checks
if: contains(matrix.os, 'ubuntu') if: contains(matrix.os, 'ubuntu')
run: | run: |
@ -82,11 +82,11 @@ jobs:
- name: build and test deb/rpm packages - name: build and test deb/rpm packages
run: | run: |
make ${EMQX_NAME}-pkg 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) - name: build and test deb/rpm packages (Elixir)
run: | run: |
make ${EMQX_NAME}-elixirpkg 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 - uses: actions/upload-artifact@v2
with: with:
name: ${{ matrix.profile}}-${{ matrix.otp }}-${{ matrix.os }} name: ${{ matrix.profile}}-${{ matrix.otp }}-${{ matrix.os }}

2
build
View File

@ -31,7 +31,7 @@ case "$ARCH" in
ARCH='arm64' ARCH='arm64'
;; ;;
arm*) arm*)
ARCH=arm ARCH='arm64'
;; ;;
esac esac
export ARCH export ARCH

View File

@ -114,4 +114,4 @@ docker run -i --rm \
--platform="linux/$ARCH" \ --platform="linux/$ARCH" \
-e EMQX_NAME="$PROFILE" \ -e EMQX_NAME="$PROFILE" \
"$BUILDER" \ "$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"