diff --git a/.github/workflows/build-instructions.yml b/.github/workflows/build-instructions.yml index 9b71b3be4..80ed8ac5e 100644 --- a/.github/workflows/build-instructions.yml +++ b/.github/workflows/build-instructions.yml @@ -51,7 +51,7 @@ jobs: shell: cmd - os: ubuntu-22.04 shell: bash - - os: macos-12 + - os: macos-13 shell: bash defaults: run: @@ -87,7 +87,7 @@ jobs: config: - os: windows-2022 - os: ubuntu-22.04 - - os: macos-12 + - os: macos-13 defaults: run: shell: bash diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 7b10028d2..4a9ac8aea 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -26,7 +26,7 @@ jobs: config: - os: ubuntu-22.04 shell: bash - - os: macos-12 + - os: macos-13 shell: bash - os: windows-2022 preamble: call "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e04934f04..2752c00d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: shell: cmd - os: ubuntu-22.04 shell: bash - - os: macos-12 + - os: macos-13 shell: bash defaults: run: diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml index 3958fc3a9..962854ebf 100644 --- a/.github/workflows/integrations.yml +++ b/.github/workflows/integrations.yml @@ -30,7 +30,7 @@ jobs: shell: cmd - os: ubuntu-22.04 shell: bash - - os: macos-12 + - os: macos-13 shell: bash defaults: run: @@ -114,7 +114,7 @@ jobs: site-packages: Lib/site-packages - os: ubuntu-22.04 site-packages: lib/python3.11/site-packages - - os: macos-12 + - os: macos-13 site-packages: lib/python3.11/site-packages defaults: run: @@ -212,7 +212,7 @@ jobs: - os: ubuntu-22.04 site-packages: lib/python3.11/site-packages shell: bash - - os: macos-12 + - os: macos-13 site-packages: lib/python3.11/site-packages shell: bash defaults: diff --git a/.github/workflows/populate-cache.yml b/.github/workflows/populate-cache.yml index d5831facb..696e487e0 100644 --- a/.github/workflows/populate-cache.yml +++ b/.github/workflows/populate-cache.yml @@ -23,7 +23,7 @@ jobs: # config.os vs os to match requirements of bootstrap_platform config: - os: ubuntu-22.04 - - os: macos-12 + - os: macos-13 - os: windows-2022 steps: diff --git a/.github/workflows/upload-release-builds.yml b/.github/workflows/upload-release-builds.yml index 771657026..c870118bf 100644 --- a/.github/workflows/upload-release-builds.yml +++ b/.github/workflows/upload-release-builds.yml @@ -41,13 +41,13 @@ jobs: - os: ubuntu-22.04 shell: bash build-type: Release - - os: macos-12 + - os: macos-13 shell: bash build-type: Debug - - os: macos-12 + - os: macos-13 shell: bash build-type: RelWithDebInfo - - os: macos-12 + - os: macos-13 shell: bash build-type: Release defaults: diff --git a/resources/build/bootstrap-macos-12.sh b/resources/build/bootstrap-macos-13.sh similarity index 100% rename from resources/build/bootstrap-macos-12.sh rename to resources/build/bootstrap-macos-13.sh diff --git a/resources/build/requirements.txt b/resources/build/requirements.txt index 32ad34d4d..abbf6c152 100644 --- a/resources/build/requirements.txt +++ b/resources/build/requirements.txt @@ -1,4 +1,4 @@ -conan==1.59.0 +conan==1.66.0 cmake==3.28.3 ninja==1.10.2.3 pip>=21.3