Skip to content

Commit e9bfab7

Browse files
committed
fix: fix linux ci
Signed-off-by: Cocoa <i@uwucocoa.moe>
1 parent 70224cb commit e9bfab7

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
lines changed

.github/workflows/linux-precompile.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313

1414
jobs:
1515
precompile:
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-22.04
1717
env:
1818
TFLITE_BEAM_PREFER_PRECOMPILED: "false"
1919
ARMV6_TOOLCHAIN_NAME: "nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64"
@@ -103,7 +103,7 @@ jobs:
103103
- name: Install system dependecies
104104
run: |
105105
sudo apt-get update
106-
sudo apt-get install -y build-essential automake autoconf pkg-config bc m4 unzip zip curl git libssl-dev gzip libncurses5-dev ca-certificates
106+
sudo apt-get install -y build-essential automake autoconf pkg-config bc m4 unzip zip curl git libssl-dev gzip libncurses5-dev ca-certificates flatbuffers-compile
107107
if [ "${{ matrix.pair.arch_name }}" = "aarch64" ]; then
108108
sudo sed -i 's/focal/jammy/g' /etc/apt/sources.list
109109
sudo apt-get update
@@ -120,12 +120,6 @@ jobs:
120120
sudo apt-get install -y ${{ matrix.pair.c_compiler }} ${{ matrix.pair.cpp_compiler }}
121121
fi
122122
123-
git clone https://github.com/google/flatbuffers.git
124-
cd flatbuffers/
125-
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release
126-
make
127-
sudo make install
128-
129123
- name: Create precompiled library
130124
run: |
131125
export NIF_VERSION="$(erl -noshell -eval "io:format('~ts', [erlang:system_info(nif_version)])." -s erlang halt)"

cc_toolchain/armv6-nerves-linux-gnueabihf.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#
22
# CMake Toolchain file for cross-compiling for armv6 on Linux (with nerves toolchain).
33
#
4-
# curl -fSL https://github.com/nerves-project/toolchains/releases/download/v13.2.0/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-13.2.0-363664F.tar.xz -o nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-13.2.0-363664F.tar.xz
5-
# tar -xf nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-13.2.0-363664F.tar.xz
6-
# sudo mv nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-13.2.0 /usr/local/bin/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-13.2.0
4+
# curl -fSL https://github.com/nerves-project/toolchains/releases/download/v14.2.0/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-14.2.0-11156D8.tar.xz -o nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-14.2.0-11156D8.tar.xz
5+
# tar -xf nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-14.2.0-11156D8.tar.xz
6+
# sudo mv nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-14.2.0 /usr/local/bin/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-14.2.0
77
#
88
set(CMAKE_SYSTEM_NAME Linux)
99
set(CMAKE_SYSTEM_PROCESSOR armv6)
1010

11-
set(CMAKE_C_COMPILER "/usr/local/bin/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-13.2.0/bin/armv6-nerves-linux-gnueabihf-gcc")
12-
set(CMAKE_CXX_COMPILER "/usr/local/bin/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-13.2.0/bin/armv6-nerves-linux-gnueabihf-g++")
11+
set(CMAKE_C_COMPILER "/usr/local/bin/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-14.2.0/bin/armv6-nerves-linux-gnueabihf-gcc")
12+
set(CMAKE_CXX_COMPILER "/usr/local/bin/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-14.2.0/bin/armv6-nerves-linux-gnueabihf-g++")
1313

1414
set(CMAKE_FIND_ROOT_PATH /usr/arm-linux-gnueabihf)
1515

cc_toolchain/riscv64-nerves-linux-gnu.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#
22
# CMake Toolchain file for cross-compiling for riscv64 on Linux (with nerves toolchain).
33
#
4-
# curl -fSL https://github.com/nerves-project/toolchains/releases/download/v13.2.0/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-13.2.0-DB80D1B.tar.xz -o nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-13.2.0-DB80D1B.tar.xz
5-
# tar -xf nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-13.2.0-DB80D1B.tar.xz
6-
# sudo mv nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-13.2.0 /usr/local/bin/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-13.2.0
4+
# curl -fSL https://github.com/nerves-project/toolchains/releases/download/v14.2.0/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-14.2.0-D43CCBE.tar.xz -o nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-14.2.0-D43CCBE.tar.xz
5+
# tar -xf nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-14.2.0-D43CCBE.tar.xz
6+
# sudo mv nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-14.2.0 /usr/local/bin/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-14.2.0
77
#
88
set(CMAKE_SYSTEM_NAME Linux)
99
set(CMAKE_SYSTEM_PROCESSOR riscv64)
1010

11-
set(CMAKE_C_COMPILER "/usr/local/bin/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-13.2.0/bin/riscv64-nerves-linux-gnu-gcc")
12-
set(CMAKE_CXX_COMPILER "/usr/local/bin/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-13.2.0/bin/riscv64-nerves-linux-gnu-g++")
11+
set(CMAKE_C_COMPILER "/usr/local/bin/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-14.2.0/bin/riscv64-nerves-linux-gnu-gcc")
12+
set(CMAKE_CXX_COMPILER "/usr/local/bin/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-14.2.0/bin/riscv64-nerves-linux-gnu-g++")
1313

1414
set(CMAKE_FIND_ROOT_PATH /usr/riscv64-linux-gnu)
1515

0 commit comments

Comments
 (0)