Skip to content

Commit cbe100c

Browse files
rbxChristianTackeGSI
authored andcommitted
Update Mac CI nodes
1 parent 53ca7a6 commit cbe100c

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

Jenkinsfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def jobMatrix(String prefix, String type, List specs) {
4848
ctestcmd = ctestcmd + " " + extra
4949
}
5050
if (selector =~ /^macos/) {
51-
sh "echo \"export SIMPATH=\$(brew --prefix fairsoft@${fairsoft})\" >> ${jobscript}"
51+
// sh "echo \"export SIMPATH=\$(brew --prefix fairsoft)\" >> ${jobscript}"
5252
} else {
5353
sh "echo \"export SIMPATH=/fairsoft/${fairsoft}\" >> ${jobscript}"
5454
}
@@ -120,7 +120,9 @@ pipeline{
120120
extra: '-DUSE_CLANG_TIDY=ON -DBUILD_MBS=OFF -DBUILD_PROOF_SUPPORT=OFF'],
121121
[os: 'fedora', ver: '33', arch: 'x86_64', compiler: 'gcc-10', fairsoft: 'apr21_patches'],
122122
[os: 'fedora', ver: '33', arch: 'x86_64', compiler: 'gcc-10', fairsoft: 'apr21_patches_mt'],
123-
[os: 'macos', ver: '12', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '22.11'],
123+
[os: 'macos', ver: '13', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '24.01'],
124+
[os: 'macos', ver: '14', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '24.01'],
125+
[os: 'macos', ver: '14', arch: 'arm64', compiler: 'apple-clang-15', fairsoft: '24.01'],
124126
// [os: 'macos', ver: '13', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '22.11'],
125127
// [os: 'macos', ver: '13', arch: 'arm64', compiler: 'apple-clang-14', fairsoft: '22.11'],
126128
// [os: 'macos', ver: '12', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '23.6'],

0 commit comments

Comments
 (0)