From d7db808ed2693f58c17d6c3a1b6af5d3d7cc400d Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Fri, 4 Jul 2025 12:00:17 -0600 Subject: [PATCH] Update version to 1.10.0-rc1, try to fix annoying failure in CI on every other build by deleting the temporary keychain file --- .github/workflows/app_build.yml | 1 + CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index c28a388af..e53c487f2 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -218,6 +218,7 @@ jobs: # ----- Configure Keychain ----- KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db + rm -f $KEYCHAIN_PATH security create-keychain -p "${{ secrets.MACOS_KEYCHAIN_PASSWORD }}" $KEYCHAIN_PATH # Unlock it for 6 hours security set-keychain-settings -lut 21600 $KEYCHAIN_PATH diff --git a/CMakeLists.txt b/CMakeLists.txt index 09c5b361e..0d0de3a9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ if(CCACHE_PROGRAM) set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE FILEPATH "C compiler cache used") endif() -project(OpenStudioApplication VERSION 1.9.0) +project(OpenStudioApplication VERSION 1.10.0) # Check system info globally so we can use it everywhere after: Has to be done before FindOpenStudioSDK.cmake if(APPLE) @@ -272,7 +272,7 @@ endif() # TODO: Modify the more specific variables as needed to indicate prerelease, etc # Keep in beta in-between release cycles. Set to empty string (or comment out) for official) -set(PROJECT_VERSION_PRERELEASE "") +set(PROJECT_VERSION_PRERELEASE "rc1") # OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")