Skip to content

Commit 086c987

Browse files
authored
Merge pull request #813 from openstudiocoalition/update_1_10
Update version to 1.10.0-rc1
2 parents 37ffec2 + d7db808 commit 086c987

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/app_build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ jobs:
218218
219219
# ----- Configure Keychain -----
220220
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
221+
rm -f $KEYCHAIN_PATH
221222
security create-keychain -p "${{ secrets.MACOS_KEYCHAIN_PASSWORD }}" $KEYCHAIN_PATH
222223
# Unlock it for 6 hours
223224
security set-keychain-settings -lut 21600 $KEYCHAIN_PATH

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if(CCACHE_PROGRAM)
1616
set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE FILEPATH "C compiler cache used")
1717
endif()
1818

19-
project(OpenStudioApplication VERSION 1.9.0)
19+
project(OpenStudioApplication VERSION 1.10.0)
2020

2121
# Check system info globally so we can use it everywhere after: Has to be done before FindOpenStudioSDK.cmake
2222
if(APPLE)
@@ -272,7 +272,7 @@ endif()
272272

273273
# TODO: Modify the more specific variables as needed to indicate prerelease, etc
274274
# Keep in beta in-between release cycles. Set to empty string (or comment out) for official)
275-
set(PROJECT_VERSION_PRERELEASE "")
275+
set(PROJECT_VERSION_PRERELEASE "rc1")
276276

277277
# OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag
278278
set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")

0 commit comments

Comments
 (0)