Skip to content

[Tooling] Fix bundler CI failure by updating bundler with security fix #15895

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
jkmassel merged 2 commits into from
Feb 16, 2021
Merged

[Tooling] Fix bundler CI failure by updating bundler with security fix #15895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a7e8e5
Fix swiftlint vioations in tooling script
AliSoftware Feb 16, 2021
74877a5
Update bundler to 2.2.10 (security fix) and use a single source for gems
AliSoftware Feb 16, 2021
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
18 changes: 9 additions & 9 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
source 'https://rubygems.org' do
gem 'rake'
gem 'cocoapods', '~> 1.10'
gem 'xcpretty-travis-formatter'
gem 'octokit', "~> 4.0"
gem 'fastlane', "~> 2.162"
gem 'dotenv'
gem 'commonmarker'
end
source 'https://rubygems.org'

gem 'rake'
gem 'cocoapods', '~> 1.10'
gem 'xcpretty-travis-formatter'
gem 'octokit', "~> 4.0"
gem 'fastlane', "~> 2.162"
gem 'dotenv'
gem 'commonmarker'

plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
eval_gemfile(plugins_path) if File.exist?(plugins_path)
16 changes: 8 additions & 8 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,18 +307,18 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.10)!
commonmarker!
dotenv!
fastlane (~> 2.162)!
cocoapods (~> 1.10)
commonmarker
dotenv
fastlane (~> 2.162)
fastlane-plugin-appcenter (~> 1.8)
fastlane-plugin-sentry
fastlane-plugin-test_center
fastlane-plugin-wpmreleasetoolkit!
octokit (~> 4.0)!
rake!
octokit (~> 4.0)
rake
rmagick (~> 3.2.0)
xcpretty-travis-formatter!
xcpretty-travis-formatter

BUNDLED WITH
2.1.4
2.2.10
11 changes: 5 additions & 6 deletions fastlane/download_metadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func downloadTranslation(languageCode: String, folderName: String) {
let sema = DispatchSemaphore( value: 0)

print("Downloading Language: \(languageCode)")

let task = session.dataTask(with: urlRequest) {
(data, response, error) -> Void in

Expand Down Expand Up @@ -88,7 +88,7 @@ func downloadTranslation(languageCode: String, folderName: String) {
var originalLanguage = String(key[index...])
originalLanguage.remove(at: originalLanguage.startIndex)
let translation = languageCode == "en-us" ? originalLanguage : firstValue

switch keyFirstPart {
case glotPressSubtitleKey:
subtitle = translation
Expand Down Expand Up @@ -125,12 +125,11 @@ func downloadTranslation(languageCode: String, folderName: String) {
print(" Error writing: \(error)")
}
}

task.resume()
sema.wait()
}

languages.forEach( { (key: String, value: String) in
languages.forEach { (key: String, value: String) in
downloadTranslation(languageCode: value, folderName: key)
})

}