From 841ad99ced2f3a0103869fee696693442a2f2b6a Mon Sep 17 00:00:00 2001 From: P3TERX <25927179+P3TERX@users.noreply.github.com> Date: Mon, 8 Feb 2021 08:07:17 +0800 Subject: [PATCH] CICD: Build Linux aarch64(arm64) platform --- .github/workflows/CICD.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 27c15db..7562e6d 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -62,6 +62,8 @@ jobs: matrix: job: - { os: ubuntu-latest , target: arm-unknown-linux-gnueabihf , use-cross: use-cross } + - { os: ubuntu-latest , target: aarch64-unknown-linux-gnu , use-cross: use-cross } + - { os: ubuntu-latest , target: aarch64-unknown-linux-musl , use-cross: use-cross } - { os: ubuntu-latest , target: i686-unknown-linux-gnu , use-cross: use-cross } - { os: ubuntu-latest , target: i686-unknown-linux-musl , use-cross: use-cross } - { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , use-cross: use-cross } @@ -77,7 +79,8 @@ jobs: shell: bash run: | case ${{ matrix.job.target }} in - arm-unknown-linux-gnueabihf) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;; + arm-*-linux-*hf) sudo apt-get -y update ; sudo apt-get -y install binutils-arm-linux-gnueabihf ;; + aarch64-*-linux-*) sudo apt-get -y update ; sudo apt-get -y install binutils-aarch64-linux-gnu ;; esac - name: Initialize workflow variables id: vars @@ -127,7 +130,7 @@ jobs: echo set-output name=DEPLOY::${DEPLOY:-/false} echo ::set-output name=DEPLOY::${DEPLOY} # DPKG architecture? - unset DPKG_ARCH ; case ${{ matrix.job.target }} in i686-*-linux-*) DPKG_ARCH=i686 ;; x86_64-*-linux-*) DPKG_ARCH=amd64 ;; esac; + unset DPKG_ARCH ; case ${{ matrix.job.target }} in aarch64-*-linux-*) DPKG_ARCH=arm64 ;; i686-*-linux-*) DPKG_ARCH=i686 ;; x86_64-*-linux-*) DPKG_ARCH=amd64 ;; esac; echo set-output name=DPKG_ARCH::${DPKG_ARCH} echo ::set-output name=DPKG_ARCH::${DPKG_ARCH} # DPKG version? @@ -153,11 +156,11 @@ jobs: echo set-output name=CARGO_USE_CROSS::${CARGO_USE_CROSS:-/false} echo ::set-output name=CARGO_USE_CROSS::${CARGO_USE_CROSS} # * test only binary for arm-type targets - unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-*) CARGO_TEST_OPTIONS="--bin ${PROJECT_NAME}" ;; esac; + unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-* | aarch64-*-linux-*) CARGO_TEST_OPTIONS="--bin ${PROJECT_NAME}" ;; esac; echo set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS} echo ::set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS} # * strip executable? - STRIP="strip" ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) STRIP="arm-linux-gnueabihf-strip" ;; *-pc-windows-msvc) STRIP="" ;; esac; + STRIP="strip" ; case ${{ matrix.job.target }} in arm-*-linux-*hf) STRIP="arm-linux-gnueabihf-strip" ;; aarch64-*-linux-*) STRIP="aarch64-linux-gnu-strip" ;; *-pc-windows-msvc) STRIP="" ;; esac; echo set-output name=STRIP::${STRIP} echo ::set-output name=STRIP::${STRIP} - name: Create all needed build/work directories