Skip to content

Commit cbd3164

Browse files
authored
Merge pull request #106 from jserv/ci-bump-toolchain
CI: Update Arm GNU Toolchain and use Ubuntu 24.04
2 parents 8fef99e + 7097d93 commit cbd3164

File tree

4 files changed

+27
-26
lines changed

4 files changed

+27
-26
lines changed

.ci/common.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
GCC_REL=14.2.rel1
2+
ARM_MIRROR=https://github.com/DLTcollab/toolchain-arm/raw/main
3+
4+
SOURCES=$(find $(git rev-parse --show-toplevel) | egrep "\.(cpp|h)\$" | egrep -v "arm-gnu-toolchain-${GCC_REL}-x86_64-aarch64-none-linux-gnu|arm-gnu-toolchain-${GCC_REL}-x86_64-arm-none-linux-gnueabihf")
5+
6+
# Expect host is Linux/x86_64
7+
check_platform()
8+
{
9+
MACHINE_TYPE=`uname -m`
10+
if [ ${MACHINE_TYPE} != 'x86_64' ]; then
11+
exit
12+
fi
13+
14+
OS_TYPE=`uname -s`
15+
if [ ${OS_TYPE} != 'Linux' ]; then
16+
exit
17+
fi
18+
}

.ci/cross-check.sh

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
#!/usr/bin/env bash
22

3-
MACHINE_TYPE=`uname -m`
4-
if [ ${MACHINE_TYPE} != 'x86_64' ]; then
5-
exit
6-
fi
3+
. .ci/common.sh
74

8-
OS_TYPE=`uname -s`
9-
if [ ${OS_TYPE} != 'Linux' ]; then
10-
exit
11-
fi
5+
check_platform
126

137
# Clang/LLVM is natively a cross-compiler.
148
# TODO: Do cross-compilation using Clang
@@ -17,9 +11,7 @@ if [ $(printenv CXX | grep clang) ]; then
1711
exit
1812
fi
1913

20-
GCC_REL=11.2-2022.02
21-
2214
set -x
2315

24-
export PATH=gcc-arm-${GCC_REL}-x86_64-arm-none-linux-gnueabihf/bin:$PATH
16+
export PATH=arm-gnu-toolchain-${GCC_REL}-x86_64-arm-none-linux-gnueabihf/bin:$PATH
2517
make CROSS_COMPILE=arm-none-linux-gnueabihf- check || exit 1

.ci/cross-tool.sh

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
#!/usr/bin/env bash
22

3-
ARM_MIRROR=https://github.com/DLTcollab/toolchain-arm/raw/main
4-
GCC_REL=11.2-2022.02
3+
. .ci/common.sh
54

6-
MACHINE_TYPE=`uname -m`
7-
if [ ${MACHINE_TYPE} != 'x86_64' ]; then
8-
exit
9-
fi
10-
11-
OS_TYPE=`uname -s`
12-
if [ ${OS_TYPE} != 'Linux' ]; then
13-
exit
14-
fi
5+
check_platform
156

167
set -x
178

@@ -21,5 +12,5 @@ sudo apt-get install -q -y qemu-user
2112
sudo apt-get install -y curl xz-utils
2213

2314
curl -L \
24-
${ARM_MIRROR}/gcc-arm-${GCC_REL}-x86_64-arm-none-linux-gnueabihf.tar.xz \
15+
${ARM_MIRROR}/arm-gnu-toolchain-${GCC_REL}-x86_64-arm-none-linux-gnueabihf.tar.xz \
2516
| tar -Jx || exit 1

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on: [push, pull_request]
44

55
jobs:
66
host_x86:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-24.04
88
strategy:
99
matrix:
10-
compiler: [gcc-10]
10+
compiler: [gcc]
1111
steps:
1212
- name: checkout code
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
- name: build artifact
1515
env:
1616
CC: ${{ matrix.compiler }}

0 commit comments

Comments
 (0)