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

Bumped tbd to 3.4.2 to update json-schema. #97

Merged
merged 5 commits into from
Sep 24, 2024
Merged

Bumped tbd to 3.4.2 to update json-schema. #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
084958c
Bumped tbd to 3.4.2 to update json-schema.
wenyikuang Sep 23, 2024
e3099aa
conan2 syntax
wenyikuang Sep 23, 2024
b37963b
rebuild windows
wenyikuang Sep 23, 2024
6ddb85b
fix windows build.
wenyikuang Sep 23, 2024
566e248
Upgrade macos to mac 12.
wenyikuang Sep 24, 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
15 changes: 8 additions & 7 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,20 @@ 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
version: 10
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
Expand All @@ -48,7 +49,7 @@ jobs:
allow_failure: false
- build_name: msvc-2022
compiler: msvc
version: 193
version: 194
os: windows-2022
allow_failure: false

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
Loading