Skip to content

Commit 77c1dae

Browse files
authored
Merge pull request #16232 from argotorg/fix_ci
Ignore sphinx syntax warnings and use m4pro.medium over macos.m1.medium.gen1
2 parents 2ca5fb3 + e734de8 commit 77c1dae

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,12 +514,12 @@ defaults:
514514

515515
- base_osx: &base_osx
516516
macos:
517-
xcode: "15.0.0"
518-
resource_class: macos.m1.medium.gen1
517+
xcode: 15.4.0
518+
resource_class: m4pro.medium
519519
environment: &base_osx_env
520520
TERM: xterm
521-
MAKEFLAGS: -j5
522-
CPUs: 5
521+
MAKEFLAGS: -j8
522+
CPUs: 8
523523

524524
- base_ubuntu_clang: &base_ubuntu_clang
525525
docker:

.circleci/osx_install_dependencies.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ function validate_checksum {
4848

4949
if [ ! -f /usr/local/lib/libz3.a ] # if this file does not exists (cache was not restored), rebuild dependencies
5050
then
51-
brew uninstall temurin17
52-
brew untap homebrew/homebrew-cask-versions
5351
brew update
5452
brew upgrade
5553
brew install cmake

docs/conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ def get_github_username_repo(url):
172172
# If true, keep warnings as "system message" paragraphs in the built documents.
173173
#keep_warnings = False
174174

175+
suppress_warnings = [
176+
# Suppress sphinx-syntax warnings, in particular `diagram descriptions can't have custom resolver_data`
177+
'sphinx_syntax',
178+
]
175179

176180
# -- Options for HTML output ----------------------------------------------
177181

0 commit comments

Comments
 (0)