From 9c301bc6930baa9ad6ea2db907949b52602b94b0 Mon Sep 17 00:00:00 2001 From: Simone Gasparini Date: Mon, 3 Nov 2025 18:14:34 +0100 Subject: [PATCH 1/4] switch to c++17 for gtest to compile --- Makefile.inc | 2 +- tests/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 9a7638b25..9908cfe30 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -2,7 +2,7 @@ CXX ?= g++ CXXWARNINGS ?= -Wall -Wextra -Wundef -pedantic CXXINTRINSICS ?= -march=native -CXXFEATURES ?= -funsafe-math-optimizations -fno-math-errno -std=c++14 +CXXFEATURES ?= -funsafe-math-optimizations -fno-math-errno -std=c++17 CXXFLAGS ?= ${CXXWARNINGS} ${CXXINTRINSICS} ${CXXFEATURES} -g -O3 # Delete this if OpenMP is not available (e.g., OS X without gcc) diff --git a/tests/Makefile b/tests/Makefile index 9964f8863..a8e10723b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -8,7 +8,7 @@ GTEST_LDFLAGS = `pkg-config --libs gtest_main` SOURCES = $(wildcard math/gtest_*.cc) $(wildcard mve/gtest_*.cc) $(wildcard sfm/gtest_*.cc) $(wildcard util/gtest_*.cc) $(wildcard fssr/gtest_*.cc) INCLUDES = -I${MVE_ROOT}/libs ${GTEST_CFLAGS} CXXWARNINGS = -Wall -Wextra -pedantic -Wno-sign-compare -CXXFLAGS = -std=c++14 -pthread ${CXXWARNINGS} ${INCLUDES} +CXXFLAGS = -std=c++17 -pthread ${CXXWARNINGS} ${INCLUDES} LDLIBS += ${GTEST_LDFLAGS} ${LIBJPEG_LDFLAGS} ${LIBPNG_LDFLAGS} ${LIBTIFF_LDFLAGS} test: ${SOURCES:.cc=.o} libmve_fssr.a libmve_sfm.a libmve.a libmve_util.a From 55ee8bfe15bfa46963cd0425c7d177e5c52e5e28 Mon Sep 17 00:00:00 2001 From: Simone Gasparini Date: Mon, 3 Nov 2025 18:17:56 +0100 Subject: [PATCH 2/4] [co] Add workflow dispatch and schedule to CI configuration monthly the 1st day --- .github/workflows/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 97e6d2219..9975e3719 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,6 +5,15 @@ on: branches: [ "master" ] pull_request: branches: [ "master" ] + workflow_dispatch: + schedule: + # every 1st day of month at 00:00 UTC + - cron: "0 0 1 * *" + +permissions: + contents: read + checks: write + pull-requests: write jobs: build: From 60c8f6750ea1429c8408af413ba41660782c62aa Mon Sep 17 00:00:00 2001 From: Simone Gasparini Date: Mon, 3 Nov 2025 21:48:30 +0100 Subject: [PATCH 3/4] [ci] fix the permissions to default --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9975e3719..528b8ecb0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,8 +12,8 @@ on: permissions: contents: read - checks: write - pull-requests: write + checks: read + pull-requests: read jobs: build: From 40cf5a42e37d5a8a8a4e01ddc8e98db9e910da0e Mon Sep 17 00:00:00 2001 From: Simone Gasparini Date: Mon, 3 Nov 2025 21:48:56 +0100 Subject: [PATCH 4/4] [ci] removed obsolete platforms --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 528b8ecb0..95e7341a8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,13 +25,10 @@ jobs: matrix: platform: - - { name: "Ubuntu 20.04, GCC, x86_64", os: ubuntu-20.04, cpp_compiler: g++, qmake_spec: linux-g++ } - - { name: "Ubuntu 20.04, Clang, x86_64", os: ubuntu-20.04, cpp_compiler: clang++, qmake_spec: linux-clang } - { name: "Ubuntu 22.04, GCC, x86_64", os: ubuntu-22.04, cpp_compiler: g++, qmake_spec: linux-g++ } - { name: "Ubuntu 22.04, Clang, x86_64", os: ubuntu-22.04, cpp_compiler: clang++, qmake_spec: linux-clang } - { name: "Ubuntu 24.04, GCC, x86_64", os: ubuntu-24.04, cpp_compiler: g++, qmake_spec: linux-g++ } - { name: "Ubuntu 24.04, Clang, x86_64", os: ubuntu-24.04, cpp_compiler: clang++, qmake_spec: linux-clang } - - { name: "macOS 13, Clang, x86_64", os: macos-13, cpp_compiler: clang++, qmake_spec: macx-clang } - { name: "macOS 14, Clang, arm64", os: macos-14, cpp_compiler: clang++, qmake_spec: macx-clang } - { name: "macOS 15, Clang, arm64", os: macos-15, cpp_compiler: clang++, qmake_spec: macx-clang }