Skip to content

fix(carthage): shell login #1179

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
yonaskolb merged 3 commits into from
Mar 21, 2022
Merged

fix(carthage): shell login #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61c1053
fix(carthage): shell login
bimawa Jan 20, 2022
4983ad3
tests(fixtures): update fixtures
bimawa Mar 20, 2022
6a55798
tests(changelog): update changelog
bimawa Mar 21, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
- Ensure fileTypes are mapped to JSON value [#1112](https://github.com/yonaskolb/XcodeGen/pull/1112) @namolnad
- Fix platform filter for package dependecies [#1123](https://github.com/yonaskolb/XcodeGen/pull/1123) @raptorxcz
- Fix Xcode 13 build [#1130](https://github.com/yonaskolb/XcodeGen/issues/1127) @raptorxcz @mthole
- Fix Monterey MacOS shell version, shell login flag for environments [#1167](https://github.com/yonaskolb/XcodeGen/issues/1167) @bimawa
Copy link
Copy Markdown
Owner

@yonaskolb yonaskolb Mar 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrong version, but I'll move it


[Commits](https://github.com/yonaskolb/XcodeGen/compare/2.24.0...2.25.0)

Expand Down
2 changes: 1 addition & 1 deletion Sources/XcodeGenKit/PBXProjGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ public class PBXProjGenerator {
name: "Carthage",
inputPaths: inputPaths,
outputPaths: outputPaths,
shellPath: "/bin/sh",
shellPath: "/bin/sh -l",
shellScript: "\(carthageExecutable) copy-frameworks\n"
)
)
Expand Down
6 changes: 3 additions & 3 deletions Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2384,7 +2384,7 @@
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Result.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellPath = "/bin/sh -l";
shellScript = "carthage copy-frameworks\n";
};
3D0637F4554EAD6FA48105BF /* MyScript */ = {
Expand Down Expand Up @@ -2473,7 +2473,7 @@
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Result.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellPath = "/bin/sh -l";
shellScript = "carthage copy-frameworks\n";
};
BA454AAC926EDFCDA9226CBC /* MyScript */ = {
Expand Down Expand Up @@ -2546,7 +2546,7 @@
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Result.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellPath = "/bin/sh -l";
shellScript = "carthage copy-frameworks\n";
};
/* End PBXShellScriptBuildPhase section */
Expand Down