Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Mac CI nodes #1597

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Update Mac CI nodes #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c52a51f
Update Mac CI nodes
rbx Nov 27, 2024
9383531
Disable -Werror=dev in the test build
rbx Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# GNU Lesser General Public Licence (LGPL) version 3, #
# copied verbatim in the file "LICENSE" #
################################################################################
cmake_minimum_required(VERSION 3.18...3.30 FATAL_ERROR)
cmake_minimum_required(VERSION 3.18...3.31 FATAL_ERROR)

set(PROJECT_MIN_CXX_STANDARD 17)

Expand Down
2 changes: 1 addition & 1 deletion FairRoot_build_test.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ctest_start(Continuous)
get_filename_component(test_install_prefix "${CTEST_BINARY_DIRECTORY}/install"
ABSOLUTE)
list(APPEND options
"-Werror=dev"
# "-Werror=dev"
"-DDISABLE_COLOR=ON"
"-DCMAKE_INSTALL_PREFIX:PATH=${test_install_prefix}"
)
Expand Down
6 changes: 3 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!groovy

def macos_builds = [
[os: "macos", ver: "13", arch: "x86_64", compiler: "apple-clang-15", fairsoft: "24.01"],
[os: "macos", ver: "14", arch: "x86_64", compiler: "apple-clang-15", fairsoft: "24.01"],
[os: "macos", ver: "14", arch: "arm64", compiler: "apple-clang-15", fairsoft: "24.01"],
[os: "macos", ver: "14", arch: "x86_64", compiler: "apple-clang-16", fairsoft: "24.01p4"],
[os: "macos", ver: "15", arch: "x86_64", compiler: "apple-clang-16", fairsoft: "24.01p4-macos15", extra: "-DBUILD_PROOF_SUPPORT=OFF"],
[os: "macos", ver: "15", arch: "arm64", compiler: "apple-clang-16", fairsoft: "24.01p4-macos15", extra: "-DBUILD_PROOF_SUPPORT=OFF"],
]

def linux_builds = [
Expand Down
Loading