From 66d8eb1d5de2ab9dc6f9c878f26e4493a6b54b7c Mon Sep 17 00:00:00 2001 From: Hicham Boushaba Date: Wed, 27 Nov 2024 14:44:01 +0100 Subject: [PATCH 1/7] Update upload-artifact and download-artifact actions --- .github/workflows/screenshots.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml index b69201f412e..280e658ffc2 100644 --- a/.github/workflows/screenshots.yml +++ b/.github/workflows/screenshots.yml @@ -37,13 +37,13 @@ jobs: run: bundle exec fastlane build_screenshots - name: Archive App - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: screenshot-app path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerce.app - name: Archive Runner - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: screenshot-runner path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerceScreenshots-Runner.app @@ -68,13 +68,13 @@ jobs: run: bundle exec fastlane run configure_apply - name: Download Screenshot App - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: screenshot-app path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerce.app - name: Download Screenshot Runner - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: screenshot-runner path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerceScreenshots-Runner.app @@ -85,7 +85,7 @@ jobs: - name: Store Logs if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: "screenshot-log-${{ matrix.language }}-${{ matrix.mode }}" path: fastlane/logs @@ -130,7 +130,7 @@ jobs: aws s3 cp fastlane/screenshots/screenshots.html s3://$S3_BUCKET/$GITHUB_RUN_ID/screenshots/screenshots.html - name: Archive Raw Screenshots - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: raw-screenshots path: fastlane/screenshots @@ -159,7 +159,7 @@ jobs: bundle exec fastlane create_promo_screenshots force:true - name: Archive Promo Screenshots - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: promo-screenshots path: fastlane/promo_screenshots From 61a12608a9fbd96b58e6a76d2ef617397541eaac Mon Sep 17 00:00:00 2001 From: Hicham Boushaba Date: Thu, 28 Nov 2024 11:42:09 +0100 Subject: [PATCH 2/7] Attempt with using iOS 18.1 for the screenshots generation --- fastlane/Fastfile | 3 +-- fastlane/screenshots.json | 54 --------------------------------------- 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index ab7e9dc91f7..2aff584c7a3 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -26,11 +26,10 @@ FASTLANE_METADATA_FOLDER = File.join(FASTLANE_DIR, 'metadata') WORKSPACE_PATH = File.join(PROJECT_ROOT_FOLDER, 'WooCommerce.xcworkspace') BUILDKITE_RELEASE_PIPELINE = 'release-builds.yml' IOS_LOCALES = %w[ar-SA de-DE en-US es-ES fr-FR he id it ja ko nl-NL pt-BR ru sv tr zh-Hans zh-Hant].freeze -SIMULATOR_VERSION = '16.0' # For screenshots +SIMULATOR_VERSION = '18.1' # For screenshots SCREENSHOTS_SCHEME = 'WooCommerceScreenshots' SCREENSHOT_DEVICES = [ 'iPhone 11 Pro Max', - 'iPhone 8 Plus', 'iPad Pro (12.9-inch) (2nd generation)', 'iPad Pro (12.9-inch) (3rd generation)' ].freeze diff --git a/fastlane/screenshots.json b/fastlane/screenshots.json index 67fd5597bb5..aa5f9221cd0 100644 --- a/fastlane/screenshots.json +++ b/fastlane/screenshots.json @@ -17,18 +17,6 @@ "device_frame_size": [966, 1954], "device_frame_offset": [138, 571] }, - { - "name": "iPhone 8 Plus", - "canvas_size": [1242,2208], - "text_size": [810, 371], - "text_offset": [216, 0], - "font_size": "68px", - "screenshot_size": [729, 1296], - "screenshot_offset": [257, 585], - "device_frame": "appstoreres/assets/iphone-8.png", - "device_frame_size": [838, 1727], - "device_frame_offset": [202, 372] - }, { "name": "iPad Pro 12.9 (2nd Generation)", "canvas_size": [2048,2732], @@ -98,48 +86,6 @@ "text": "metadata/{locale}/app_store_screenshot_5.txt" }, - // iPhone 8 Plus - // Track sales and bestselling products - { - "device": "iPhone 8 Plus", - "filename": "iPhone 8 Plus-01.png", - "background": "#674399", - "screenshot": "iPhone 8 Plus-1-dark-order-dashboard.png", - "text": "metadata/{locale}/app_store_screenshot_1.txt" - }, - // Create orders on the fly - { - "device": "iPhone 8 Plus", - "filename": "iPhone 8 Plus-02.png", - "background": "#C9356E", - "screenshot": "iPhone 8 Plus-2-light-order-creation.png", - "text": "metadata/{locale}/app_store_screenshot_2.txt" - }, - // Take payments in person - { - "device": "iPhone 8 Plus", - "filename": "iPhone 8 Plus-03.png", - "background": "#674399", - "screenshot": "iPhone 8 Plus-3-dark-order-payment.png", - "text": "metadata/{locale}/app_store_screenshot_3.txt" - }, - // Add and edit products with a touch - { - "device": "iPhone 8 Plus", - "filename": "iPhone 8 Plus-04.png", - "background": "#C9356E", - "screenshot": "iPhone 8 Plus-4-light-product-add.png", - "text": "metadata/{locale}/app_store_screenshot_4.txt" - }, - // Get notified of every sale - { - "device": "iPhone 8 Plus", - "filename": "iPhone 8 Plus-05.png", - "background": "#674399", - "screenshot": "iPhone 8 Plus-5-dark-order-notification.png", - "text": "metadata/{locale}/app_store_screenshot_5.txt" - }, - /// iPad Pro 12.9 (2nd Generation) // Track sales and bestselling products From ebc3e4d07a7ea141cdf012c969049d30a7313078 Mon Sep 17 00:00:00 2001 From: Hicham Boushaba Date: Thu, 28 Nov 2024 12:52:01 +0100 Subject: [PATCH 3/7] Remove iPad Pro 2nd gen screenshots --- fastlane/Fastfile | 1 - fastlane/screenshots.json | 55 --------------------------------------- 2 files changed, 56 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 2aff584c7a3..1bbe6c36f7f 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -30,7 +30,6 @@ SIMULATOR_VERSION = '18.1' # For screenshots SCREENSHOTS_SCHEME = 'WooCommerceScreenshots' SCREENSHOT_DEVICES = [ 'iPhone 11 Pro Max', - 'iPad Pro (12.9-inch) (2nd generation)', 'iPad Pro (12.9-inch) (3rd generation)' ].freeze diff --git a/fastlane/screenshots.json b/fastlane/screenshots.json index aa5f9221cd0..87b13f582b3 100644 --- a/fastlane/screenshots.json +++ b/fastlane/screenshots.json @@ -17,18 +17,6 @@ "device_frame_size": [966, 1954], "device_frame_offset": [138, 571] }, - { - "name": "iPad Pro 12.9 (2nd Generation)", - "canvas_size": [2048,2732], - "text_size": [1848, 559], - "text_offset": [100, 0], - "font_size": "100px", - "screenshot_size": [1290, 1721], - "screenshot_offset": [380, 707], - "device_frame": "appstoreres/assets/ipad.png", - "device_frame_size": [1400, 2015], - "device_frame_offset": [324, 559] - }, { "name": "iPad Pro 12.9 (3rd Generation)", "canvas_size": [2048,2732], @@ -86,49 +74,6 @@ "text": "metadata/{locale}/app_store_screenshot_5.txt" }, - - /// iPad Pro 12.9 (2nd Generation) - // Track sales and bestselling products - { - "device": "iPad Pro 12.9 (2nd Generation)", - "filename": "iPad Pro (12.9-inch) (2nd generation)-01.png", - "background": "#674399", - "screenshot": "iPad Pro (12.9-inch) (2nd generation)-1-dark-order-dashboard.png", - "text": "metadata/{locale}/app_store_screenshot_1.txt" - }, - // Create orders on the fly - { - "device": "iPad Pro 12.9 (2nd Generation)", - "filename": "iPad Pro (12.9-inch) (2nd generation)-02.png", - "background": "#C9356E", - "screenshot": "iPad Pro (12.9-inch) (2nd generation)-2-light-order-creation.png", - "text": "metadata/{locale}/app_store_screenshot_2.txt" - }, - // Take payments in person - { - "device": "iPad Pro 12.9 (2nd Generation)", - "filename": "iPad Pro (12.9-inch) (2nd generation)-03.png", - "background": "#674399", - "screenshot": "iPad Pro (12.9-inch) (2nd generation)-3-dark-order-payment.png", - "text": "metadata/{locale}/app_store_screenshot_3.txt" - }, - // Add and edit products with a touch - { - "device": "iPad Pro 12.9 (2nd Generation)", - "filename": "iPad Pro (12.9-inch) (2nd generation)-04.png", - "background": "#C9356E", - "screenshot": "iPad Pro (12.9-inch) (2nd generation)-4-light-product-add.png", - "text": "metadata/{locale}/app_store_screenshot_4.txt" - }, - // Get notified of every sale - { - "device": "iPad Pro 12.9 (2nd Generation)", - "filename": "iPad Pro (12.9-inch) (2nd generation)-05.png", - "background": "#674399", - "screenshot": "iPad Pro (12.9-inch) (2nd generation)-5-dark-order-notification.png", - "text": "metadata/{locale}/app_store_screenshot_5.txt" - }, - /// iPad Pro 12.9 (3rd Generation) // Track sales and bestselling products { From 55dcf5c4dde66fe3a25343200d9b9e06f67ab5fb Mon Sep 17 00:00:00 2001 From: Hicham Boushaba Date: Thu, 28 Nov 2024 13:40:55 +0100 Subject: [PATCH 4/7] Use same ar language in github action --- .github/workflows/screenshots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml index 280e658ffc2..a6271bc20f4 100644 --- a/.github/workflows/screenshots.yml +++ b/.github/workflows/screenshots.yml @@ -55,7 +55,7 @@ jobs: strategy: matrix: - language: [ar, de-DE, en-US, es-ES, fr-FR, he, id, it, ja, ko, nl-NL, pt-BR, ru, sv, tr, zh-Hans, zh-Hant] + language: [ar-SA, de-DE, en-US, es-ES, fr-FR, he, id, it, ja, ko, nl-NL, pt-BR, ru, sv, tr, zh-Hans, zh-Hant] mode: [dark, light] steps: - uses: actions/checkout@v1 From 30e0d5d642a5fe714e68c58151ccd933ce7b4fc0 Mon Sep 17 00:00:00 2001 From: Hicham Boushaba Date: Thu, 28 Nov 2024 14:56:46 +0100 Subject: [PATCH 5/7] Archive and download the watch app --- .github/workflows/screenshots.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml index a6271bc20f4..0f1a864316f 100644 --- a/.github/workflows/screenshots.yml +++ b/.github/workflows/screenshots.yml @@ -42,6 +42,12 @@ jobs: name: screenshot-app path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerce.app + - name: Archive Watch App + uses: actions/upload-artifact@v4 + with: + name: watch-app + path: fastlane/DerivedData/Build/Products/Debug-watchsimulator/Woo Watch App.app + - name: Archive Runner uses: actions/upload-artifact@v4 with: @@ -73,6 +79,12 @@ jobs: name: screenshot-app path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerce.app + - name: Download Watch App + uses: actions/download-artifact@v4 + with: + name: watch-app + path: fastlane/DerivedData/Build/Products/Debug-watchsimulator/Woo Watch App.app + - name: Download Screenshot Runner uses: actions/download-artifact@v4 with: From acf167ef6ff2752f2123302916b50d9269d836e7 Mon Sep 17 00:00:00 2001 From: Hicham Boushaba Date: Thu, 28 Nov 2024 16:32:21 +0100 Subject: [PATCH 6/7] Upload the whole Products directory instead --- .github/workflows/screenshots.yml | 32 ++++--------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml index 0f1a864316f..1334cc53adb 100644 --- a/.github/workflows/screenshots.yml +++ b/.github/workflows/screenshots.yml @@ -39,20 +39,8 @@ jobs: - name: Archive App uses: actions/upload-artifact@v4 with: - name: screenshot-app - path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerce.app - - - name: Archive Watch App - uses: actions/upload-artifact@v4 - with: - name: watch-app - path: fastlane/DerivedData/Build/Products/Debug-watchsimulator/Woo Watch App.app - - - name: Archive Runner - uses: actions/upload-artifact@v4 - with: - name: screenshot-runner - path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerceScreenshots-Runner.app + name: build + path: fastlane/DerivedData/Build/Products/ capture: name: Capture @@ -76,20 +64,8 @@ jobs: - name: Download Screenshot App uses: actions/download-artifact@v4 with: - name: screenshot-app - path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerce.app - - - name: Download Watch App - uses: actions/download-artifact@v4 - with: - name: watch-app - path: fastlane/DerivedData/Build/Products/Debug-watchsimulator/Woo Watch App.app - - - name: Download Screenshot Runner - uses: actions/download-artifact@v4 - with: - name: screenshot-runner - path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerceScreenshots-Runner.app + name: build + path: fastlane/DerivedData/Build/Products/ - name: Generate Screenshots run: | From 6b6f6eab861fad64cacf7a8e878dc522b868885a Mon Sep 17 00:00:00 2001 From: Hicham Boushaba Date: Fri, 29 Nov 2024 09:47:37 +0100 Subject: [PATCH 7/7] Try to collect logs for tests results --- .github/workflows/screenshots.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml index 1334cc53adb..e00c5612d6f 100644 --- a/.github/workflows/screenshots.yml +++ b/.github/workflows/screenshots.yml @@ -49,8 +49,8 @@ jobs: strategy: matrix: - language: [ar-SA, de-DE, en-US, es-ES, fr-FR, he, id, it, ja, ko, nl-NL, pt-BR, ru, sv, tr, zh-Hans, zh-Hant] - mode: [dark, light] + language: [ar-SA] + mode: [light] steps: - uses: actions/checkout@v1 - name: "Set up Ruby" @@ -78,6 +78,13 @@ jobs: name: "screenshot-log-${{ matrix.language }}-${{ matrix.mode }}" path: fastlane/logs + - name: Store test results + if: always() + uses: actions/upload-artifact@v4 + with: + name: "test-results-${{ matrix.language }}-${{ matrix.mode }}" + path: fastlane/screenshots/test_output + - name: Archive Generated Screenshots run: | cd fastlane && mkdir $GITHUB_RUN_ID && mv screenshots $GITHUB_RUN_ID