[ci] Update gcc version

ossia · Apr 3, 2024 · d81a0d2 · d81a0d2
1 parent 5e08356
commit d81a0d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/.github/actions/latest-rpi-toolchain/action.yml b/.github/actions/latest-rpi-toolchain/action.yml
@@ -10,16 +10,6 @@ runs:
         sudo apt-get upgrade -yqq
         sudo apt-get install -yqq build-essential g++ ninja-build libavahi-client-dev wget
 
-        wget -nv https://github.com/ossia/sdk/releases/download/sdk24/cross-gcc-10.3.0-pi.tar.gz
-        tar xf cross-gcc-10.3.0-pi.tar.gz
-        sudo mv cross-pi-gcc-10.3.0-2 /opt/
-        sudo ln -s /opt/cross-pi-gcc-10.3.0-2 /opt/cross-pi-gcc
-
-        sudo ln -s /usr/include/arm-linux-gnueabihf/sys /usr/include/sys
-        sudo ln -s /usr/include/arm-linux-gnueabihf/bits /usr/include/bits
-        sudo ln -s /usr/include/arm-linux-gnueabihf/gnu /usr/include/gnu
-        sudo ln -s /usr/include/arm-linux-gnueabihf/asm /usr/include/asm
-        sudo ln -s /usr/lib/arm-linux-gnueabihf/crti.o /usr/lib/crti.o
-        sudo ln -s /usr/lib/arm-linux-gnueabihf/crt1.o /usr/lib/crt1.o
-        sudo ln -s /usr/lib/arm-linux-gnueabihf/crtn.o /usr/lib/crtn.o
-        
+        wget -nv https://github.com/tttapa/docker-arm-cross-toolchain/releases/download/0.1.2/x-tools-aarch64-rpi3-linux-gnu.tar.xz
+        tar xaf x-tools-aarch64-rpi3-linux-gnu.tar.xz
+        sudo mv x-tools/aarch64-rpi3-linux-gnu /opt/cross-pi-gcc
diff --git a/.github/workflows/libossia.yml b/.github/workflows/libossia.yml
@@ -126,15 +126,16 @@ jobs:
         BUILD_TYPE: ${{ matrix.build_type }}
       run: |
         export CTEST_OUTPUT_ON_FAILURE=1
-        export RPI_ROOT_PATH=/opt/cross-pi-gcc
-        export PKG_CONFIG_SYSROOT_DIR=$RPI_ROOT_PATH
-        export PKG_CONFIG_LIBDIR=${RPI_ROOT_PATH}/usr/lib/pkgconfig:${RPI_ROOT_PATH}/usr/share/pkgconfig:${RPI_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/pkgconfig/
+        # export RPI_ROOT_PATH=/opt/cross-pi-gcc
+        # export PKG_CONFIG_SYSROOT_DIR=$RPI_ROOT_PATH
+        # export PKG_CONFIG_LIBDIR=${RPI_ROOT_PATH}/usr/lib/pkgconfig:${RPI_ROOT_PATH}/usr/share/pkgconfig:${RPI_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/pkgconfig/
         export PATH=/opt/cross-pi-gcc/bin:${PATH}
         export LD_LIBRARY_PATH=/opt/cross-pi-gcc/lib:${LD_LIBRARY_PATH}
 
         cmake -B build -S ${GITHUB_WORKSPACE} \
-            -DCMAKE_TOOLCHAIN_FILE="${GITHUB_WORKSPACE}/cmake/toolchain/arm-linux-gnueabihf.cmake" \
-            -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOSSIA_STATIC=$STATIC \
+            -DCMAKE_TOOLCHAIN_FILE="/opt/cross-pi-gcc/aarch64-rpi3-linux-gnu.toolchain.cmake" \
+            -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+            -DOSSIA_STATIC=$STATIC \
             -DCMAKE_INSTALL_PREFIX=install \
             -DOSSIA_CI=1
         cmake --build build