From 665f2412f1fdab94f18e3d21e01c0f73802517c1 Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 21 Sep 2023 05:14:15 -0700 Subject: [PATCH] Version bump, macos/ios build fix [no ci] --- CMakeLists.txt | 4 ++-- deploy/build_ios.sh | 2 +- deploy/build_macos.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ecde0cdf..f6f94a234 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) set(PROJECT AmneziaVPN) -project(${PROJECT} VERSION 3.1.0.0 +project(${PROJECT} VERSION 3.1.0.1 DESCRIPTION "AmneziaVPN" HOMEPAGE_URL "https://amnezia.org/" ) -set(RELEASE_DATE "2023-08-28") +set(RELEASE_DATE "2023-09-21") set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") diff --git a/deploy/build_ios.sh b/deploy/build_ios.sh index c4c0691a2..7f16b9163 100755 --- a/deploy/build_ios.sh +++ b/deploy/build_ios.sh @@ -34,7 +34,7 @@ clang -v # Generate XCodeProj $QT_BIN_DIR/qt-cmake . -B $BUILD_DIR -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR -KEYCHAIN=amnezia.build.keychain +KEYCHAIN=amnezia.build.ios.keychain KEYCHAIN_FILE=$HOME/Library/Keychains/${KEYCHAIN}-db # Setup keychain diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 54b6dbe3c..700198e7f 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -79,7 +79,7 @@ if [ "${MAC_CERT_PW+x}" ]; then CERTIFICATE_P12=$DEPLOY_DIR/PrivacyTechAppleCertDeveloperId.p12 WWDRCA=$DEPLOY_DIR/WWDRCA.cer - KEYCHAIN=amnezia.build.keychain + KEYCHAIN=amnezia.build.macos.keychain TEMP_PASS=tmp_pass security create-keychain -p $TEMP_PASS $KEYCHAIN || true