Skip to content

Commit 3e22354

Browse files
authored
Merge pull request #6933 from woocommerce/fix/screenshot-generation
Screenshots: Fix errors generating promo screenshots with Fastlane
2 parents ba4e365 + f523a2f commit 3e22354

File tree

7 files changed

+40
-36
lines changed

7 files changed

+40
-36
lines changed

Gemfile.lock

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
GIT
2+
remote: [email protected]:wordpress-mobile/release-toolkit
3+
revision: 48bf4f8ee18079154b2054b3014bed9f114416d6
4+
branch: trunk
5+
specs:
6+
fastlane-plugin-wpmreleasetoolkit (4.1.0)
7+
activesupport (~> 5)
8+
bigdecimal (~> 1.4)
9+
buildkit (~> 1.5)
10+
chroma (= 0.2.0)
11+
diffy (~> 3.3)
12+
git (~> 1.3)
13+
jsonlint (~> 0.3)
14+
nokogiri (~> 1.11)
15+
octokit (~> 4.18)
16+
parallel (~> 1.14)
17+
progress_bar (~> 1.3)
18+
rake (>= 12.3, < 14.0)
19+
rake-compiler (~> 1.0)
20+
121
GEM
222
remote: https://rubygems.org/
323
specs:
@@ -165,20 +185,6 @@ GEM
165185
xcpretty-travis-formatter (>= 0.0.3)
166186
fastlane-plugin-appcenter (1.11.1)
167187
fastlane-plugin-sentry (1.11.1)
168-
fastlane-plugin-wpmreleasetoolkit (4.1.0)
169-
activesupport (~> 5)
170-
bigdecimal (~> 1.4)
171-
buildkit (~> 1.5)
172-
chroma (= 0.2.0)
173-
diffy (~> 3.3)
174-
git (~> 1.3)
175-
jsonlint (~> 0.3)
176-
nokogiri (~> 1.11)
177-
octokit (~> 4.18)
178-
parallel (~> 1.14)
179-
progress_bar (~> 1.3)
180-
rake (>= 12.3, < 14.0)
181-
rake-compiler (~> 1.0)
182188
ffi (1.15.4)
183189
fourflusher (2.3.1)
184190
fuzzy_match (2.0.4)
@@ -247,15 +253,15 @@ GEM
247253
nap (1.1.0)
248254
naturally (2.2.1)
249255
netrc (0.11.0)
250-
nokogiri (1.13.4)
256+
nokogiri (1.13.6)
251257
mini_portile2 (~> 2.8.0)
252258
racc (~> 1.4)
253-
nokogiri (1.13.4-x86_64-darwin)
259+
nokogiri (1.13.6-x86_64-darwin)
254260
racc (~> 1.4)
255261
octokit (4.22.0)
256262
faraday (>= 0.9)
257263
sawyer (~> 0.8.0, >= 0.5.3)
258-
oj (3.13.11)
264+
oj (3.13.13)
259265
optimist (3.0.1)
260266
options (2.3.2)
261267
optparse (0.1.1)
@@ -281,7 +287,7 @@ GEM
281287
uber (< 0.2.0)
282288
retriable (3.1.2)
283289
rexml (3.2.5)
284-
rmagick (3.2.0)
290+
rmagick (4.2.5)
285291
rouge (2.0.7)
286292
rubocop (1.25.1)
287293
parallel (~> 1.10)
@@ -359,9 +365,9 @@ DEPENDENCIES
359365
fastlane (~> 2)
360366
fastlane-plugin-appcenter (~> 1.6)
361367
fastlane-plugin-sentry (~> 1.0)
362-
fastlane-plugin-wpmreleasetoolkit (~> 4.1)
368+
fastlane-plugin-wpmreleasetoolkit!
363369
rake (~> 12.3)
364-
rmagick (~> 3.2.0)
370+
rmagick (~> 4.1)
365371
rubocop (~> 1.25)
366372
rubocop-rake (~> 0.6)
367373
xcode-install

fastlane/Fastfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ platform :ios do
841841

842842
desc 'Create Promo Screenshots'
843843
lane :create_promo_screenshots do |options|
844-
unless Fastlane::Helper::GitHelper.has_git_lfs
844+
unless Fastlane::Helper::GitHelper.has_git_lfs?
845845
UI.user_error!('LFS not enabled – unable to generate promo screenshots. Run `git lfs install && git lfs fetch && git lfs pull` to fix this.')
846846
end
847847

fastlane/Pluginfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
# frozen_string_literal: true
22

3-
# Autogenerated by fastlane
4-
#
53
# Ensure this file is checked in to source control!
64

75
group :screenshots, optional: true do
8-
gem 'rmagick', '~> 3.2.0'
6+
gem 'rmagick', '~> 4.1'
97
end
108

11-
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 4.1'
9+
gem 'fastlane-plugin-wpmreleasetoolkit', git: '[email protected]:wordpress-mobile/release-toolkit', branch: 'trunk' # Version 4.1 + fixes for promo screenshots helper (pending the next toolkit release)
1210
gem 'fastlane-plugin-sentry', '~> 1.0'
1311
gem 'fastlane-plugin-appcenter', '~> 1.6'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Tieni traccia delle vendite e dei
2-
prodotti ad alte prestazioni
2+
prodotti che performano meglio
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Rivedi i dettaglio dell'ordine
1+
Rivedi i dettagli dell'ordine
22
e i pagamenti
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Visualizza prodotti e
1+
Visualizza i prodotti e
22
controlla l'inventario

fastlane/screenshots.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@
8686
"device": "iPhone 11 Pro Max",
8787
"filename": "iPhone 11 Pro Max-04.png",
8888
"background": "#C9356E",
89-
"screenshot": "iPhone 11 Pro Max-7-light-product-list.png",
89+
"screenshot": "iPhone 11 Pro Max-5-light-product-list.png",
9090
"text": "metadata/{locale}/app_store_screenshot_4.txt"
9191
},
9292
// Get notified about new reviews
9393
{
9494
"device": "iPhone 11 Pro Max",
9595
"filename": "iPhone 11 Pro Max-05.png",
9696
"background": "#674399",
97-
"screenshot": "iPhone 11 Pro Max-5-dark-review-list.png",
97+
"screenshot": "iPhone 11 Pro Max-7-dark-review-list.png",
9898
"text": "metadata/{locale}/app_store_screenshot_5.txt"
9999
},
100100

@@ -128,15 +128,15 @@
128128
"device": "iPhone 8 Plus",
129129
"filename": "iPhone 8 Plus-04.png",
130130
"background": "#C9356E",
131-
"screenshot": "iPhone 8 Plus-7-light-product-list.png",
131+
"screenshot": "iPhone 8 Plus-5-light-product-list.png",
132132
"text": "metadata/{locale}/app_store_screenshot_4.txt"
133133
},
134134
// Get notified about new reviews
135135
{
136136
"device": "iPhone 8 Plus",
137137
"filename": "iPhone 8 Plus-05.png",
138138
"background": "#674399",
139-
"screenshot": "iPhone 8 Plus-5-dark-review-list.png",
139+
"screenshot": "iPhone 8 Plus-7-dark-review-list.png",
140140
"text": "metadata/{locale}/app_store_screenshot_5.txt"
141141
},
142142

@@ -171,15 +171,15 @@
171171
"device": "iPad Pro 12.9 (2nd Generation)",
172172
"filename": "iPad Pro (12.9-inch) (2nd generation)-04.png",
173173
"background": "#C9356E",
174-
"screenshot": "iPad Pro (12.9-inch) (2nd generation)-7-light-product-list.png",
174+
"screenshot": "iPad Pro (12.9-inch) (2nd generation)-5-light-product-list.png",
175175
"text": "metadata/{locale}/app_store_screenshot_4.txt"
176176
},
177177
// Get notified about new reviews
178178
{
179179
"device": "iPad Pro 12.9 (2nd Generation)",
180180
"filename": "iPad Pro (12.9-inch) (2nd generation)-05.png",
181181
"background": "#674399",
182-
"screenshot": "iPad Pro (12.9-inch) (2nd generation)-5-dark-review-list.png",
182+
"screenshot": "iPad Pro (12.9-inch) (2nd generation)-7-dark-review-list.png",
183183
"text": "metadata/{locale}/app_store_screenshot_5.txt"
184184
},
185185

@@ -213,15 +213,15 @@
213213
"device": "iPad Pro 12.9 (3rd Generation)",
214214
"filename": "iPad Pro (12.9-inch) (3rd generation)-04.png",
215215
"background": "#C9356E",
216-
"screenshot": "iPad Pro (12.9-inch) (3rd generation)-7-light-product-list.png",
216+
"screenshot": "iPad Pro (12.9-inch) (3rd generation)-5-light-product-list.png",
217217
"text": "metadata/{locale}/app_store_screenshot_4.txt"
218218
},
219219
// Get notified about new reviews
220220
{
221221
"device": "iPad Pro 12.9 (3rd Generation)",
222222
"filename": "iPad Pro (12.9-inch) (3rd generation)-05.png",
223223
"background": "#674399",
224-
"screenshot": "iPad Pro (12.9-inch) (3rd generation)-5-dark-review-list.png",
224+
"screenshot": "iPad Pro (12.9-inch) (3rd generation)-7-dark-review-list.png",
225225
"text": "metadata/{locale}/app_store_screenshot_5.txt"
226226
}
227227
]

0 commit comments

Comments
 (0)