Skip to content

Commit 66a7f23

Browse files
authored
Remove pod_lib_lint script workaround (#8557)
1 parent 03cf705 commit 66a7f23

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

scripts/pod_lib_lint.rb

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,8 @@ def main(args)
7878
# Run the lib lint command in a thread.
7979
pod_lint_status = 1
8080
t = Thread.new do
81-
with_removed_social_media_url(podspec_file) do
82-
system(*command)
83-
pod_lint_status = $?.exitstatus
84-
end
81+
system(*command)
82+
pod_lint_status = $?.exitstatus
8583
end
8684

8785
# Print every minute since linting can run for >10m without output.
@@ -174,21 +172,6 @@ def trace(*args)
174172
STDERR.puts(args.join(' '))
175173
end
176174

177-
# Edits the given podspec file to remove the social_media_url, yields, then
178-
# restores the file to its original condition. Validating of the social URL
179-
# can be very flaky (see #3416). Remove it from spec to let the actual tests
180-
# pass.
181-
def with_removed_social_media_url(spec)
182-
podspec_content = File.read(spec)
183-
updated_podspec_content =
184-
podspec_content.gsub("s.social_media_url = ", "# s.social_media_url = ")
185-
write_file(spec, updated_podspec_content)
186-
yield
187-
188-
ensure
189-
write_file(spec, podspec_content)
190-
end
191-
192175
# Writes the text in +contents+ to the file named by +filename+.
193176
def write_file(filename, contents)
194177
File.open(filename, "w") do |file|

0 commit comments

Comments
 (0)