From 10595ecc047b8c70732dc2cd90a28bef40fff446 Mon Sep 17 00:00:00 2001
From: Alexey Alter-Pesotskiy <alex@testableapple.com>
Date: Thu, 13 Feb 2025 11:52:47 +0000
Subject: [PATCH] [CI] Resolve Allure issue

---
 .github/workflows/e2e-test.yml | 4 ++--
 fastlane/Fastfile              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index bf5f194083d..1800548590b 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -61,13 +61,13 @@ jobs:
           emulator-options: ${{ vars.EMULATOR_OPTIONS }}
           script: bundle exec fastlane run_e2e_test batch:${{ matrix.batch }} batch_count:${{ strategy.job-total }}
       - name: Allure TestOps Upload
-        if: ${{ success() || failure() }} && ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}
+        if: ${{ env.LAUNCH_ID != '' && (success() || failure()) }}
         run: bundle exec fastlane allure_upload
         env:
           ALLURE_TOKEN: ${{ secrets.ALLURE_TOKEN }}
           LAUNCH_ID: ${{ env.LAUNCH_ID }}
       - name: Allure TestOps Launch Removal
-        if: cancelled() && ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}
+        if: ${{ env.LAUNCH_ID != '' && cancelled() }}
         run: bundle exec fastlane allure_launch_removal
         env:
           ALLURE_TOKEN: ${{ secrets.ALLURE_TOKEN }}
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1d8f375b553..d62f1a5d424 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -165,9 +165,9 @@ private_lane :install do |options|
     output = 'test-parser.jar'
     url = "https://linkedin.jfrog.io/artifactory/open-source/com/linkedin/dextestparser/parser/#{v}/parser-#{v}-all.jar"
   when :allurectl
-    v = '2.15.1'
+    v = '2.16.0'
     output = 'allurectl'
-    arch = RbConfig::CONFIG['host_os'].include?('darwin') ? 'darwin_amd64' : 'linux_386'
+    arch = RbConfig::CONFIG['host_os'].include?('darwin') ? 'darwin_amd64' : 'linux_amd64'
     url = "https://github.com/allure-framework/allurectl/releases/download/#{v}/allurectl_#{arch}"
   else
     UI.user_error!('Provide a correct tool name.')