Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
runner authored and runner committed Nov 14, 2022
2 parents 0729431 + 879443a commit 9fd152c
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 20 deletions.
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
LANG: en_US.UTF-8
LC_ALL: en_US.UTF-8
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 60
FASTLANE_GITHUB_RELEASE_API_BEARER: ${{ secrets.ACCESS_TOKEN }}
uses: maierj/fastlane-action@v2.3.0
with:
lane: beta
Expand Down
36 changes: 24 additions & 12 deletions fastlane/Fastfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ platform :ios do
before_all do |lane, options|
if is_ci? && "#{lane}" != "unittests"
ensure_env_vars(
env_vars: %w[ASC_API_KEY ASC_API_KEY_ID ASC_API_KEY_ISSUER_ID]
env_vars: %w[ASC_API_KEY ASC_API_KEY_ID ASC_API_KEY_ISSUER_ID FASTLANE_GITHUB_RELEASE_API_BEARER]
)
end

Expand Down Expand Up @@ -176,17 +176,29 @@ platform :ios do
)
push_to_git_remote(tags: true)
sh 'git checkout develop'

set_github_release(
api_token: is_ci? ? ENV['ACCESS_TOKEN'] : ENV['GITHUB_API_TOKEN'],
api_bearer: ENV['ACCESS_TOKEN'],
repository_name: 'openhab/openhab-ios',
name: "#{type.capitalize} version #{version}",
tag_name: version.to_s,
description: changelog,
commitish: 'main'
# upload_assets: no assets supported
)

if is_ci?
set_github_release(
api_bearer: ENV['FASTLANE_GITHUB_RELEASE_API_BEARER'],
repository_name: 'openhab/openhab-ios',
name: "#{type.capitalize} version #{version}",
tag_name: version.to_s,
description: changelog,
commitish: 'main'
# upload_assets: no assets supported
)
else
set_github_release(
api_token: ENV['GITHUB_API_TOKEN'],
repository_name: 'openhab/openhab-ios',
name: "#{type.capitalize} version #{version}",
tag_name: version.to_s,
description: changelog,
commitish: 'main'
# upload_assets: no assets supported
)
end

end

end
Expand Down
28 changes: 20 additions & 8 deletions openHAB.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1517,7 +1517,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1580410531;
CURRENT_PROJECT_VERSION = 1580410532;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = PBAPXHRAM9;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand All @@ -1531,7 +1531,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.4.56;
MARKETING_VERSION = 2.4.57;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.openHABIntents;
Expand Down Expand Up @@ -1560,7 +1560,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1580410531;
CURRENT_PROJECT_VERSION = 1580410532;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = PBAPXHRAM9;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand All @@ -1573,7 +1573,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.4.56;
MARKETING_VERSION = 2.4.57;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.openHABIntents;
Expand Down Expand Up @@ -1617,6 +1617,7 @@
CURRENT_PROJECT_VERSION = 1580410520;
CURRENT_PROJECT_VERSION = 1580410529;
CURRENT_PROJECT_VERSION = 1580410531;
CURRENT_PROJECT_VERSION = 1580410532;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = PBAPXHRAM9;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -1644,6 +1645,7 @@
MARKETING_VERSION = 2.4.54;
MARKETING_VERSION = 2.4.55;
MARKETING_VERSION = 2.4.56;
MARKETING_VERSION = 2.4.57;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openHABUITests;
Expand Down Expand Up @@ -1691,6 +1693,7 @@
CURRENT_PROJECT_VERSION = 1580410520;
CURRENT_PROJECT_VERSION = 1580410529;
CURRENT_PROJECT_VERSION = 1580410531;
CURRENT_PROJECT_VERSION = 1580410532;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = PBAPXHRAM9;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -1718,6 +1721,7 @@
MARKETING_VERSION = 2.4.54;
MARKETING_VERSION = 2.4.55;
MARKETING_VERSION = 2.4.56;
MARKETING_VERSION = 2.4.57;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openHABUITests;
Expand Down Expand Up @@ -1984,7 +1988,7 @@
CURRENT_PROJECT_VERSION = 1580410446;
CURRENT_PROJECT_VERSION = 1580410455;
"CODE_SIGN_STYLE[sdk=*]" = Automatic;
CURRENT_PROJECT_VERSION = 1580410531;
CURRENT_PROJECT_VERSION = 1580410532;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = PBAPXHRAM9;
GCC_C_LANGUAGE_STANDARD = "compiler-default";
Expand All @@ -1997,7 +2001,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.4.56;
MARKETING_VERSION = 2.4.57;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.watchkitapp;
Expand Down Expand Up @@ -2048,6 +2052,7 @@
CURRENT_PROJECT_VERSION = 1580410520;
CURRENT_PROJECT_VERSION = 1580410529;
CURRENT_PROJECT_VERSION = 1580410531;
CURRENT_PROJECT_VERSION = 1580410532;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = PBAPXHRAM9;
GCC_C_LANGUAGE_STANDARD = "compiler-default";
Expand All @@ -2060,7 +2065,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.4.56;
MARKETING_VERSION = 2.4.57;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.watchkitapp;
Expand Down Expand Up @@ -2251,6 +2256,7 @@
CURRENT_PROJECT_VERSION = 1580410520;
CURRENT_PROJECT_VERSION = 1580410529;
CURRENT_PROJECT_VERSION = 1580410531;
CURRENT_PROJECT_VERSION = 1580410532;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = PBAPXHRAM9;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -2278,6 +2284,7 @@
MARKETING_VERSION = 2.4.54;
MARKETING_VERSION = 2.4.55;
MARKETING_VERSION = 2.4.56;
MARKETING_VERSION = 2.4.57;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.reg-labs.openHABTestsSwift";
Expand Down Expand Up @@ -2326,6 +2333,7 @@
CURRENT_PROJECT_VERSION = 1580410520;
CURRENT_PROJECT_VERSION = 1580410529;
CURRENT_PROJECT_VERSION = 1580410531;
CURRENT_PROJECT_VERSION = 1580410532;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = PBAPXHRAM9;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -2353,6 +2361,7 @@
MARKETING_VERSION = 2.4.54;
MARKETING_VERSION = 2.4.55;
MARKETING_VERSION = 2.4.56;
MARKETING_VERSION = 2.4.57;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.reg-labs.openHABTestsSwift";
Expand Down Expand Up @@ -2512,6 +2521,7 @@
CURRENT_PROJECT_VERSION = 1580410520;
CURRENT_PROJECT_VERSION = 1580410529;
CURRENT_PROJECT_VERSION = 1580410531;
CURRENT_PROJECT_VERSION = 1580410532;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = PBAPXHRAM9;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand Down Expand Up @@ -2544,6 +2554,7 @@
MARKETING_VERSION = 2.4.54;
MARKETING_VERSION = 2.4.55;
MARKETING_VERSION = 2.4.56;
MARKETING_VERSION = 2.4.57;
OTHER_SWIFT_FLAGS = "$(inherited) -DDEBUG -Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";
PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -2577,7 +2588,7 @@
CODE_SIGN_IDENTITY = "Apple Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1580410531;
CURRENT_PROJECT_VERSION = 1580410532;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = PBAPXHRAM9;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand Down Expand Up @@ -2610,6 +2621,7 @@
MARKETING_VERSION = 2.4.54;
MARKETING_VERSION = 2.4.55;
MARKETING_VERSION = 2.4.56;
MARKETING_VERSION = 2.4.57;
PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand Down

0 comments on commit 9fd152c

Please sign in to comment.