From fa5189c6e6f9e93f409e64ca9b92f18beb31deaa Mon Sep 17 00:00:00 2001 From: Steffen Winter Date: Sat, 19 Apr 2025 14:39:48 +0200 Subject: [PATCH] CI: Bump gcc version for NetBSD Signed-off-by: Steffen Winter --- .github/workflows/cmake-netbsd.yml | 4 ++-- .github/workflows/continuous-build-netbsd.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake-netbsd.yml b/.github/workflows/cmake-netbsd.yml index 3370ed0..ae7b662 100644 --- a/.github/workflows/cmake-netbsd.yml +++ b/.github/workflows/cmake-netbsd.yml @@ -44,8 +44,8 @@ jobs: PKG_PATH="https://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${{ matrix.arch }}/${{ matrix.version }}/All/" export PATH PKG_PATH /usr/sbin/pkg_add pkgin - pkgin -y install cmake ninja-build gcc10 coreutils git + pkgin -y install cmake ninja-build gcc14 coreutils git git config --global --add safe.directory /home/runner/work/btop/btop run: | - cmake -DCMAKE_CXX_COMPILER="/usr/pkg/gcc10/bin/g++" -B build -G Ninja -DBTOP_STATIC=OFF + cmake -DCMAKE_CXX_COMPILER="/usr/pkg/gcc14/bin/g++" -B build -G Ninja -DBTOP_STATIC=OFF cmake --build build --verbose diff --git a/.github/workflows/continuous-build-netbsd.yml b/.github/workflows/continuous-build-netbsd.yml index fc6459e..1ace36b 100644 --- a/.github/workflows/continuous-build-netbsd.yml +++ b/.github/workflows/continuous-build-netbsd.yml @@ -49,10 +49,10 @@ jobs: PKG_PATH="https://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/10.1/All/" export PATH PKG_PATH /usr/sbin/pkg_add pkgin - pkgin -y install gmake gcc10 coreutils git + pkgin -y install gmake gcc14 coreutils git git config --global --add safe.directory /home/runner/work/btop/btop run: | - gmake CXX=/usr/pkg/gcc10/bin/g++ CXXFLAGS='-DNDEBUG -I/usr/pkg/gcc10/include -I/usr/include -I/usr/pkg/include' STATIC=true STRIP=true + gmake CXX=/usr/pkg/gcc14/bin/g++ CXXFLAGS='-DNDEBUG -I/usr/pkg/gcc10/include -I/usr/include -I/usr/pkg/include' STATIC=true STRIP=true GIT_HASH=$(git rev-parse --short "$GITHUB_SHA") mv bin/btop bin/btop-GCC10-"$GIT_HASH" ls -alh bin