Skip to content

Commit 32cc582

Browse files
committed
chore: bump armv6 and riscv64 toolchain to v14.2.0
Signed-off-by: Cocoa <i@uwucocoa.moe>
1 parent 3936ac5 commit 32cc582

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

.github/workflows/linux-precompile.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ jobs:
1616
runs-on: ubuntu-20.04
1717
env:
1818
TFLITE_BEAM_PREFER_PRECOMPILED: "false"
19+
ARMV6_TOOLCHAIN_NAME: "nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64"
20+
ARMV6_TOOLCHAIN_VERSION: "14.2.0"
21+
ARMV6_TOOLCHAIN_HASH: "11156D8"
22+
RISCV64_TOOLCHAIN_NAME: "nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64"
23+
RISCV64_TOOLCHAIN_VERSION: "14.2.0"
24+
RISCV64_TOOLCHAIN_HASH: "D43CCBE"
25+
1926
name: ${{ matrix.pair.target_arch }}-${{ matrix.pair.target_os }}-${{ matrix.pair.target_abi }} - OTP ${{ matrix.pair.otp }}
2027

2128
strategy:
@@ -70,8 +77,8 @@ jobs:
7077
target_arch: "armv6"
7178
target_os: "linux"
7279
target_abi: "gnueabihf"
73-
cc: "/usr/local/bin/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-13.2.0/bin/armv6-nerves-linux-gnueabihf-gcc"
74-
cxx: "/usr/local/bin/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-13.2.0/bin/armv6-nerves-linux-gnueabihf-g++"
80+
cc: "/usr/local/bin/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-14.2.0/bin/armv6-nerves-linux-gnueabihf-gcc"
81+
cxx: "/usr/local/bin/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-14.2.0/bin/armv6-nerves-linux-gnueabihf-g++"
7582
- pair:
7683
otp: "25.x"
7784
arch_name: riscv64
@@ -82,8 +89,8 @@ jobs:
8289
target_arch: "riscv64"
8390
target_os: "linux"
8491
target_abi: "gnu"
85-
cc: "/usr/local/bin/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-13.2.0/bin/riscv64-nerves-linux-gnu-gcc"
86-
cxx: "/usr/local/bin/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-13.2.0/bin/riscv64-nerves-linux-gnu-g++"
92+
cc: "/usr/local/bin/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-14.2.0/bin/riscv64-nerves-linux-gnu-gcc"
93+
cxx: "/usr/local/bin/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-14.2.0/bin/riscv64-nerves-linux-gnu-g++"
8794

8895
steps:
8996
- name: Checkout
@@ -102,23 +109,17 @@ jobs:
102109
sudo apt-get update
103110
fi
104111
if [ "${{ matrix.pair.arch_name }}" = "armv6" ]; then
105-
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
106-
tar -xf nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-13.2.0-363664F.tar.xz
107-
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
112+
curl -fSL https://github.com/nerves-project/toolchains/releases/download/v${ARMV6_TOOLCHAIN_VERSION}/${ARMV6_TOOLCHAIN_NAME}-${ARMV6_TOOLCHAIN_VERSION}-11156D8.tar.xz -o ${ARMV6_TOOLCHAIN_NAME}-${ARMV6_TOOLCHAIN_VERSION}-${ARMV6_TOOLCHAIN_HASH}.tar.xz
113+
tar -xf ${ARMV6_TOOLCHAIN_NAME}-${ARMV6_TOOLCHAIN_VERSION}-${ARMV6_TOOLCHAIN_HASH}.tar.xz
114+
sudo mv ${ARMV6_TOOLCHAIN_NAME}-${ARMV6_TOOLCHAIN_VERSION} /usr/local/bin/${ARMV6_TOOLCHAIN_NAME}-${ARMV6_TOOLCHAIN_VERSION}
108115
elif [ "${{ matrix.pair.arch_name }}" = "riscv64" ]; then
109-
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
110-
tar -xf nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-13.2.0-DB80D1B.tar.xz
111-
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
116+
curl -fSL https://github.com/nerves-project/toolchains/releases/download/v14.2.0/${RISCV64_TOOLCHAIN_NAME}-${RISCV64_TOOLCHAIN_VERSION}-${RISCV64_TOOLCHAIN_HASH}.tar.xz -o ${RISCV64_TOOLCHAIN_NAME}-${RISCV64_TOOLCHAIN_VERSION}-${RISCV64_TOOLCHAIN_HASH}.tar.xz
117+
tar -xf ${RISCV64_TOOLCHAIN_NAME}-${RISCV64_TOOLCHAIN_VERSION}-${RISCV64_TOOLCHAIN_HASH}.tar.xz
118+
sudo mv ${RISCV64_TOOLCHAIN_NAME}-${RISCV64_TOOLCHAIN_VERSION} /usr/local/bin/${RISCV64_TOOLCHAIN_NAME}-${RISCV64_TOOLCHAIN_VERSION}
112119
else
113120
sudo apt-get install -y ${{ matrix.pair.c_compiler }} ${{ matrix.pair.cpp_compiler }}
114121
fi
115122
116-
git clone https://github.com/google/flatbuffers.git
117-
cd flatbuffers/
118-
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release
119-
make
120-
sudo make install
121-
122123
- name: Create precompiled library
123124
run: |
124125
export NIF_VERSION="$(erl -noshell -eval "io:format('~ts', [erlang:system_info(nif_version)])." -s erlang halt)"
@@ -134,9 +135,9 @@ jobs:
134135
135136
if [ "${{ matrix.pair.arch_name }}" = "armv6" ]; then
136137
export TARGET_GCC_FLAGS="-mabi=aapcs-linux -mfpu=vfp -marm -fstack-protector-strong -mfloat-abi=hard -mcpu=arm1176jzf-s -fPIE -pie -Wl,-z,now -Wl,-z,relro"
137-
export PATH="/usr/local/bin/nerves_toolchain_armv6_nerves_linux_gnueabihf-linux_x86_64-13.2.0/bin/:${PATH}"
138+
export PATH="/usr/local/bin/${ARMV6_TOOLCHAIN_NAME}-${ARMV6_TOOLCHAIN_VERSION}/bin/:${PATH}"
138139
elif [ "${{ matrix.pair.arch_name }}" = "riscv64" ]; then
139-
export PATH="/usr/local/bin/nerves_toolchain_riscv64_nerves_linux_gnu-linux_x86_64-13.2.0/bin/:${PATH}"
140+
export PATH="/usr/local/bin/${RISCV64_TOOLCHAIN_NAME}-${RISCV64_TOOLCHAIN_VERSION}/bin/:${PATH}"
140141
fi
141142
142143
echo "CMAKE_TOOLCHAIN_FILE: ${CMAKE_TOOLCHAIN_FILE}"

0 commit comments

Comments
 (0)