diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da1f157..0961b18 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: # fail-fast: Default is true, switch to false to allow one platform to fail and still run others fail-fast: false matrix: - build_name: [gcc-10, apple-clang-11, apple-clang-14-armv8, msvc-2022] + build_name: [gcc-10, apple-clang-13, apple-clang-14-armv8, msvc-2022] include: - build_name: gcc-10 compiler: gcc @@ -34,11 +34,12 @@ jobs: os: ubuntu-20.04 # dockerImage: conanio/gcc10-ubuntu16.04:latest allow_failure: false - - build_name: apple-clang-11 + - build_name: apple-clang-13 compiler: apple-clang - version: 11 - os: macos-11 - SDKROOT: /Applications/Xcode_11.7.app + version: 13 + os: macos-12 + arch: x86_64 + SDKROOT: /Applications/Xcode_13.2.1.app allow_failure: false - build_name: apple-clang-14-armv8 compiler: apple-clang @@ -48,7 +49,7 @@ jobs: allow_failure: false - build_name: msvc-2022 compiler: msvc - version: 193 + version: 194 os: windows-2022 allow_failure: false @@ -71,7 +72,7 @@ jobs: shell: bash run: | set -x - pip install conan==2.2.2 + pip install conan==2.3.2 conan --version if [ "$RUNNER_OS" == "Windows" ]; then diff --git a/Gemfile b/Gemfile index 9c352d0..857319a 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ elsif !FINAL_PACKAGE gem 'oslg', '= 0.3.0' if !MINIMAL_GEMS - gem 'tbd', '= 3.4.1' + gem 'tbd', '= 3.4.2' gem 'osut', '= 0.5.0' # gem 'openstudio-standards', '= 0.6.0.rc1', :github => 'NREL/openstudio-standards', :ref => 'v0.6.0.rc1' @@ -96,7 +96,7 @@ else gem 'oslg', '= 0.3.0' if !MINIMAL_GEMS - gem 'tbd', '= 3.4.1' + gem 'tbd', '= 3.4.2' gem 'osut', '= 0.5.0' gem 'openstudio-standards', '= 0.6.1'