From 6c8dcea4606897c3a12424143782ed5d3f214d9c Mon Sep 17 00:00:00 2001 From: LongYinan Date: Thu, 11 Mar 2021 00:19:38 +0800 Subject: [PATCH] ci: running cross compile testing on ubuntu-20.04 --- .github/workflows/linux-aarch64.yaml | 6 +++--- .github/workflows/linux-armv7.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux-aarch64.yaml b/.github/workflows/linux-aarch64.yaml index bcd44b18..fef069c9 100644 --- a/.github/workflows/linux-aarch64.yaml +++ b/.github/workflows/linux-aarch64.yaml @@ -2,7 +2,7 @@ name: Linux-aarch64 env: DEBUG: 'napi:*' - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: 'aarch64-linux-gnu-gcc' + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: 'aarch64-linux-gnu-gcc-9' on: push: @@ -13,7 +13,7 @@ on: jobs: build: name: stable - aarch64-unknown-linux-gnu - node@14 - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset @@ -60,7 +60,7 @@ jobs: key: npm-cache-linux-aarch64-gnu-node@14-${{ hashFiles('yarn.lock') }} - name: Install cross compile toolchain - run: sudo apt-get install gcc-aarch64-linux-gnu g++-6-aarch64-linux-gnu -y + run: sudo apt-get install gcc-9-aarch64-linux-gnu g++-9-aarch64-linux-gnu -y - name: Install dependencies run: yarn install --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000 diff --git a/.github/workflows/linux-armv7.yaml b/.github/workflows/linux-armv7.yaml index 2e325a24..1a30a772 100644 --- a/.github/workflows/linux-armv7.yaml +++ b/.github/workflows/linux-armv7.yaml @@ -2,7 +2,7 @@ name: Linux-armv7 env: DEBUG: 'napi:*' - CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: 'arm-linux-gnueabihf-gcc' + CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: 'arm-linux-gnueabihf-gcc-9' on: push: @@ -12,8 +12,8 @@ on: jobs: build: - name: stable - aarch64-unknown-linux-gnu - node@14 - runs-on: ubuntu-latest + name: stable - armv7-unknown-linux-gnu - node@14 + runs-on: ubuntu-20.04 steps: - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset @@ -60,7 +60,7 @@ jobs: key: npm-cache-linux-armv7-gnu-node@14-${{ hashFiles('yarn.lock') }} - name: Install cross compile toolchain - run: sudo apt-get install gcc-arm-linux-gnueabihf -y + run: sudo apt-get install gcc-9-arm-linux-gnueabihf -y - name: Install dependencies run: yarn install --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000