From 1faa97340201aa3773920efc7b81a23c7df9b801 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sun, 8 Jan 2023 13:55:35 +0100 Subject: [PATCH] Bump Cirrus CI FreeBSD image from 12.1 to 13.1 (#4295) * Cirrus CI, print gcc version & print compile commands * upgrade freebsd from 12.1 to 12.3 * Add changelog entry * Bump to 13.1 * Update changelog entry --- .cirrus.yml | 16 ++++++++++++++-- CHANGELOG.md | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 86bd5955e..4f6a74ab5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,5 @@ freebsd_instance: - image: freebsd-12-1-release-amd64 + image: freebsd-13-1-release-amd64 task: install_script: @@ -9,5 +9,17 @@ task: git submodule update mkdir build cd build - cmake CMAKE_C_COMPILER="cc" -DCMAKE_CXX_COMPILER="c++" -DCMAKE_C_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DCMAKE_CXX_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DLINK_OPTIONS="-fstack-protector-strong" -DCMAKE_INSTALL_PREFIX="/usr/local" -DUSE_SYSTEM_QTKEYCHAIN="ON" -DCMAKE_BUILD_TYPE="release" .. + c++ --version + cmake \ + -DCMAKE_C_COMPILER="cc" \ + -DCMAKE_CXX_COMPILER="c++" \ + -DCMAKE_C_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " \ + -DCMAKE_CXX_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " \ + -DLINK_OPTIONS="-fstack-protector-strong" \ + -DCMAKE_INSTALL_PREFIX="/usr/local" \ + -DUSE_SYSTEM_QTKEYCHAIN="ON" \ + -DCMAKE_BUILD_TYPE="release" \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + .. + cat compile_commands.json make -j $(getconf _NPROCESSORS_ONLN) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2335549f..b82f85308 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ - Dev: Removed TooltipPreviewImage. (#4268) - Dev: Removed unused operators in `Image` (#4267) - Dev: Removed usage of deprecated `QDesktopWidget` (#4287) +- Dev: Bump Cirrus CI FreeBSD image from 12.1 to 13.1. (#4295) ## 2.4.0