diff --git a/CMakeLists.txt b/CMakeLists.txt index 90a3eb8..08ea121 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,11 +17,16 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX # project +# NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds +# can come from a variety of sources. If you are mirroring the sources or otherwise build when +# the .git directory is not present, please comment the following line: include(GetGitCommitHash) +# and instead uncomment the following, adding the complete git hash of the checkout you are using: +# set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000) project(solvespace) set(solvespace_VERSION_MAJOR 2) -set(solvespace_VERSION_MINOR 1) +set(solvespace_VERSION_MINOR 2) string(SUBSTRING "${GIT_COMMIT_HASH}" 0 8 solvespace_GIT_HASH) if(NOT WIN32 AND NOT APPLE) diff --git a/appveyor.yml b/appveyor.yml index 8078a56..4f4b3ae 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.1.{build} +version: 2.2.{build} clone_depth: 1 before_build: - git submodule update --init @@ -19,7 +19,6 @@ artifacts: - path: build\src\RelWithDebInfo\solvespace.pdb name: solvespace.pdb deploy: - # Releases to solvespace/solvespace - provider: GitHub auth_token: secure: P9/pf2nM+jlWKe7pCjMp41HycBNP/+5AsmE/TETrDUoBOa/9WFHelqdVFrbRn9IC @@ -27,11 +26,3 @@ deploy: artifact: solvespace.exe on: appveyor_repo_tag: true - # Releases to whitequark/solvespace (to be removed) - - provider: GitHub - auth_token: - secure: Flqxu1cz6PyxVT1wzTP4bSrQOY8wFrO7pJxYxvjEkLqIUU4dsDQrs2rac/A9deet - description: "" - artifact: solvespace.exe - on: - appveyor_repo_tag: true