Skip to content

Bots are copied from template with wrong git branch. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
E-B-Smith merged 14 commits into from
Jan 30, 2019
Merged

Bots are copied from template with wrong git branch. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5dc4ee9
Update docs.
E-B-Smith Jan 24, 2019
a92903a
Server permissions.
E-B-Smith Jan 24, 2019
9bacd2c
* Added start/cancel integration menu item.
E-B-Smith Jan 24, 2019
53d1a31
* Added About Box credits.
E-B-Smith Jan 24, 2019
6fddc53
On start, if no servers defined, prompt to add one.
E-B-Smith Jan 24, 2019
e49ec8b
* Updated README documentation.
E-B-Smith Jan 26, 2019
d9f29ab
Updated README.
E-B-Smith Jan 28, 2019
243a34c
Updated documentation.
E-B-Smith Jan 28, 2019
fcc94dd
Updated documentation.
E-B-Smith Jan 29, 2019
7c6c238
Update signing.
E-B-Smith Jan 29, 2019
3e3c6a7
Save work.
E-B-Smith Jan 29, 2019
6c22c22
Ready for release.
E-B-Smith Jan 29, 2019
034582d
Not solved yet.
E-B-Smith Jan 30, 2019
6e53abc
Merge branch 'staging' of github.com:E-B-Smith/xcode-github into fix-…
E-B-Smith Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion XcodeGitHub/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleVersion</key>
<string>1</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2018 Branch. All rights reserved.</string>
<string>Copyright © 2018 Branch Metrics. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
17 changes: 14 additions & 3 deletions XcodeGitHub/XGXcodeBot.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,20 +535,31 @@ - (XGXcodeBot*_Nullable) duplicateBotWithNewName:(NSString*_Nonnull)newBotName
(CFDictionaryRef)self.dictionary,
kCFPropertyListMutableContainers
);
dictionary[@"configuration"]
[@"sourceControlBlueprint"]
[@"DVTSourceControlWorkspaceBlueprintIdentifierKey"] =
[NSUUID UUID].UUIDString;
dictionary[@"configuration"]
[@"sourceControlBlueprint"]
[@"DVTSourceControlWorkspaceBlueprintLocationsKey"]
[self.sourceControlWorkspaceBlueprintLocationsID]
[@"DVTSourceControlBranchIdentifierKey"] =
branchName;
dictionary[@"configuration"]
[@"sourceControlBlueprint"]
[@"DVTSourceControlWorkspaceBlueprintLocationsKey"]
[self.sourceControlWorkspaceBlueprintLocationsID]
[@"DVTSourceControlLocationRevisionKey"] =
nil;
dictionary[@"configuration"][@"scheduleType"] = @2; // 2: On commit
dictionary[@"integration_counter"] = nil;
dictionary[@"lastRevisionBlueprint"] = nil;
dictionary[@"integration_counter"] = @0;
dictionary[@"lastRevisionBlueprint"] = @{};
dictionary[@"name"] = newBotName;
dictionary[@"templateBotName"] = self.name;
dictionary[@"pullRequestNumber"] = pullRequestNumber;
dictionary[@"pullRequestTitle"] = pullRequestTitle;

dictionary[@"sourceControlBlueprintIdentifier"] = [NSUUID UUID].UUIDString;

NSData *data = [NSJSONSerialization dataWithJSONObject:dictionary options:0 error:&localError];
if (!data) {
localError = [NSError errorWithDomain:NSCocoaErrorDomain code:NSKeyValueValidationError
Expand Down
17 changes: 0 additions & 17 deletions build-release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,6 @@ compress_product XcodeGitHub.app
compress_product XcodeGitHub.app.dSYM
compress_product XcodeGitHub.framework

ditto -c -k --sequesterRsrc --keepParent \
"$build_products_directory"/XcodeGitHub.app \
"$build_products_directory"/XcodeGitHub.app.zip
rm -rf "$build_products_directory"/XcodeGitHub.app

ditto -c -k --sequesterRsrc --keepParent \
"$build_products_directory"/XcodeGitHub.framework \
"$build_products_directory"/XcodeGitHub.framework.zip
rm -rf "$build_products_directory"/XcodeGitHub.framework

rm -Rf "$build_products_directory"/libXcodeGitHub.a
rm -Rf "$build_products_directory"/usr

Expand All @@ -94,13 +84,6 @@ then
exit 1
fi

rm -rf "$build_products_directory"

if ! askYN "Release version ${marketing_version}?"
then
exit 1
fi

git add --all
git commit --allow-empty -m "Release ${marketing_version}."
git tag v"${marketing_version}"
Expand Down
4 changes: 2 additions & 2 deletions xcode-github-app.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Products",
"$(PROJECT_DIR)/Build/**",
);
INFOPLIST_FILE = "$(SRCROOT)/xcode-github-app/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
Expand All @@ -502,7 +502,7 @@
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Products",
"$(PROJECT_DIR)/Build/**",
);
INFOPLIST_FILE = "$(SRCROOT)/xcode-github-app/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
Expand Down
2 changes: 1 addition & 1 deletion xcode-github-app/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<true/>
</dict>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2018–2019 Branch. All rights reserved.</string>
<string>Copyright © 2018–2019 Branch Metrics. All rights reserved.</string>
<key>NSMainStoryboardFile</key>
<string>Main</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion xcode-github-tests/xcode-github-test-lib-info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2018 Branch. All rights reserved.</string>
<string>Copyright © 2018 Branch Metrics. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down