Skip to content

Commit 564b5b7

Browse files
authored
Refactor [v111] Cleanup carthage leftover mentions (#13020)
* Clean up carthage mentions in PreActions * Clean up setup build tools script
1 parent 2412e2a commit 564b5b7

File tree

3 files changed

+10
-67
lines changed

3 files changed

+10
-67
lines changed

Client.xcodeproj/xcshareddata/xcschemes/Fennec_Enterprise_UITests.xcscheme

-18
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,6 @@
173173
shouldUseLaunchSchemeArgsEnv = "NO"
174174
language = "en"
175175
region = "US">
176-
<PreActions>
177-
<ExecutionAction
178-
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
179-
<ActionContent
180-
title = "Run Script"
181-
scriptText = "/usr/local/bin/carthage checkout">
182-
</ActionContent>
183-
</ExecutionAction>
184-
</PreActions>
185176
<MacroExpansion>
186177
<BuildableReference
187178
BuildableIdentifier = "primary"
@@ -306,14 +297,5 @@
306297
<ArchiveAction
307298
buildConfiguration = "Fennec"
308299
revealArchiveInOrganizer = "YES">
309-
<PreActions>
310-
<ExecutionAction
311-
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
312-
<ActionContent
313-
title = "Run Script"
314-
scriptText = "/usr/local/bin/carthage checkout">
315-
</ActionContent>
316-
</ExecutionAction>
317-
</PreActions>
318300
</ArchiveAction>
319301
</Scheme>

Client.xcodeproj/xcshareddata/xcschemes/Fennec_Enterprise_XCUITests.xcscheme

-9
Original file line numberDiff line numberDiff line change
@@ -519,14 +519,5 @@
519519
<ArchiveAction
520520
buildConfiguration = "Fennec"
521521
revealArchiveInOrganizer = "YES">
522-
<PreActions>
523-
<ExecutionAction
524-
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
525-
<ActionContent
526-
title = "Run Script"
527-
scriptText = "/usr/local/bin/carthage checkout">
528-
</ActionContent>
529-
</ExecutionAction>
530-
</PreActions>
531522
</ArchiveAction>
532523
</Scheme>

setup_build_tools.sh

+10-40
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Install all the required dependencies for building and deploying Firefox for iOS
55
# Assumes you already have git otherwise you wouldn't have this setup script
66
#
7-
# run ./setup.sh from the command line to run
7+
# run ./setup_build_tools.sh from the command line to run
88
#
99

1010
#
@@ -28,18 +28,8 @@ if [[ $? != 0 ]] ; then
2828
echo "Installing Homebrew"
2929
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
3030
else
31-
echo "Homebrew already installed"
32-
fi
33-
34-
#
35-
# Check if python is installed
36-
#
37-
if [ ! -e $(python -c 'from distutils.sysconfig import get_makefile_filename as m; print m()') ]; then
38-
# Install python
39-
echo "Installing python"
40-
brew install python
41-
else
42-
echo "python already installed"
31+
echo "Homebrew already installed, but will update to get latest"
32+
brew update
4333
fi
4434

4535
#
@@ -49,30 +39,11 @@ which -s virtualenv
4939
if [[ $? != 0 ]] ; then
5040
# Install virtualenv
5141
echo "Installing vitualenv"
52-
pip install virtualenv
42+
pip3 install virtualenv
5343
else
5444
echo "virtualenv already installed"
5545
fi
5646

57-
if [ ! -d /usr/local/Cellar/imagemagick ] ; then
58-
echo "installing imagemagick"
59-
brew install imagemagick
60-
else
61-
echo "imagemagick already installed"
62-
fi
63-
64-
#
65-
# Check if Carthage is installed
66-
#
67-
which -s carthage
68-
if [[ $? != 0 ]] ; then
69-
# Install Carthage
70-
echo "Installing Carthage"
71-
brew install carthage
72-
else
73-
echo "Carthage already installed"
74-
fi
75-
7647
#
7748
# Check if Node is installed
7849
#
@@ -86,14 +57,13 @@ else
8657
fi
8758

8859
#
89-
# Check if fastlane is installed
60+
# Check if swiftlint is installed
9061
#
91-
which -s fastlane
62+
which -s swiftlint
9263
if [[ $? != 0 ]] ; then
93-
# Install fastlane
94-
echo "Installing fastlane."
95-
sudo gem install fastlane
96-
fastlane init
64+
# Install swiftlint
65+
echo "Installing swiftlint."
66+
brew install swiftlint
9767
else
98-
echo "fastlane already installed"
68+
echo "Swiftlint already installed"
9969
fi

0 commit comments

Comments
 (0)