Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
57c72408
Unverified
Commit
57c72408
authored
Oct 21, 2016
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Integration] Skip running xcodebuild in the validator
For cross-platform consistency in execution output
parent
c12df9ab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
validator.rb
lib/cocoapods/validator.rb
+1
-1
integration.rb
spec/integration.rb
+5
-5
No files found.
lib/cocoapods/validator.rb
View file @
57c72408
...
...
@@ -550,7 +550,7 @@ module Pod
end
def
xcodebuild_available?
!
Executable
.
which
(
'xcodebuild'
).
nil?
!
Executable
.
which
(
'xcodebuild'
).
nil?
&&
ENV
[
'COCOAPODS_VALIDATOR_SKIP_XCODEBUILD'
].
nil?
end
FILE_PATTERNS
=
%i(source_files resources preserve_paths vendored_libraries
...
...
spec/integration.rb
View file @
57c72408
...
...
@@ -126,11 +126,11 @@ describe_cli 'pod' do
subject
do
|
s
|
s
.
executable
=
"ruby
#{
ROOT
+
'bin/pod'
}
"
s
.
environment_vars
=
{
'C
P_REPOS_DIR'
=>
ROOT
+
'spec/fixtures/spec-repos
'
,
'COCOAPODS_
SKIP_CACHE'
=>
'TRUE'
,
'
XCODEPROJ_DISABLE_XCPROJ'
=>
'TRUE'
,
'C
LAIDE_DISABLE_AUTO_WRAP
'
=>
'TRUE'
,
'C
OCOAPODS_DISABLE_STATS'
=>
'TRUE
'
,
'C
LAIDE_DISABLE_AUTO_WRAP'
=>
'TRUE
'
,
'COCOAPODS_
DISABLE_STATS'
=>
'TRUE'
,
'
COCOAPODS_SKIP_CACHE'
=>
'TRUE'
,
'C
OCOAPODS_VALIDATOR_SKIP_XCODEBUILD
'
=>
'TRUE'
,
'C
P_REPOS_DIR'
=>
ROOT
+
'spec/fixtures/spec-repos
'
,
}
s
.
default_args
=
[
'--verbose'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment