From b6befe1bec16980bdf263de707c904748985659e Mon Sep 17 00:00:00 2001 From: Siddarth Kumar Date: Fri, 23 Feb 2024 23:31:03 +0530 Subject: [PATCH] chore: update ios/logs to logs dir fixes #18915 In this PR https://github.com/status-im/status-mobile/pull/18900 we added a `logs` folder in the root directory and it was discovered that we also have an `ios/logs` folder which the CI uses to generates logs during build time. Its more consistent if we move those logs to the log folder in the root of the repo. This commit fixes that and updates leftover usages. --- ci/Jenkinsfile.ios | 2 +- fastlane/Fastfile | 5 +++-- ios/StatusIm.xcodeproj/project.pbxproj | 10 +++++----- ios/logs/README.md | 14 -------------- logs/README.md | 11 ++++++++++- 5 files changed, 19 insertions(+), 23 deletions(-) delete mode 100644 ios/logs/README.md diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index a8c25525af05..144776d7543b 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -63,7 +63,7 @@ pipeline { } post { failure { - archiveArtifacts 'ios/logs/*' + archiveArtifacts 'logs/*' } } } diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d0206250ec33..61448da2b1bf 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,4 +1,5 @@ # This file contains the fastlane.tools configuration + # You can find the documentation at https://docs.fastlane.tools # # For a list of all available actions, check out @@ -96,7 +97,7 @@ end # if false - read list of devices from AppStoreConnect, and upgrade the provisioning profiles from it # `pr_build`: # if true - uses StatusImPR scheme and postfixed app id with `.pr` to build an app, which can be used in parallel with release -# if false - uses StatusIm scheme to build the release app +# if false - uses StatusIm scheme to build the release app def build_ios_adhoc(readonly: false, pr_build: false) # PR builds should appear as a separate App on iOS @@ -123,7 +124,7 @@ def build_ios_adhoc(readonly: false, pr_build: false) export_method: 'ad-hoc', output_name: 'StatusIm', output_directory: 'status-ios', - buildlog_path: 'ios/logs', + buildlog_path: 'logs', export_options: { signingStyle: 'manual', provisioningProfiles: { diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj index aa2253cb46c3..2f6e1bde37a9 100644 --- a/ios/StatusIm.xcodeproj/project.pbxproj +++ b/ios/StatusIm.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -542,7 +542,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/usr/bin/env sh"; - shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1"; + shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > "\"${PROJECT_DIR}/../logs/react-native-xcode.log\" 2>&1\"; }; 28606042DA81A750949525E4 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; @@ -578,7 +578,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/usr/bin/env sh"; - shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1"; + shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > "\"${PROJECT_DIR}/../logs/react-native-xcode.log\" 2>&1\"; }; 3AAD2AD724A3A60E0075D594 /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -592,7 +592,7 @@ ); runOnlyForDeploymentPostprocessing = 1; shellPath = "/usr/bin/env sh"; - shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1"; + shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > "\"${PROJECT_DIR}/../logs/set_xcode_version.log\" 2>&1\"; }; 523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; @@ -716,7 +716,7 @@ ); runOnlyForDeploymentPostprocessing = 1; shellPath = "/usr/bin/env sh"; - shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1"; + shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > "\"${PROJECT_DIR}/../logs/set_xcode_version.log\" 2>&1\"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/ios/logs/README.md b/ios/logs/README.md deleted file mode 100644 index a4ab7207a355..000000000000 --- a/ios/logs/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Description - -This directory is the destination of logs created by Fastlane and React Native Xcode script. - -# Logs - -* `react-native-xcode.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`. - - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj`. -* `Status PR-StatusImPR.log - Created by [Fastlane Gym](https://docs.fastlane.tools/actions/gym/). - - Configred via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`. - -# CI - -These log files are uploaded to Jenkins as CI job artifacts on failure using `archiveArtifacts`. diff --git a/logs/README.md b/logs/README.md index eaea0d52ed63..f52b132ba9fd 100644 --- a/logs/README.md +++ b/logs/README.md @@ -1,6 +1,6 @@ # Description -This directory is the destination of logs created during build time of debug builds. +This directory is the destination of logs created during build time of debug builds and logs created by Fastlane on CI. # Logs @@ -16,3 +16,12 @@ This directory is the destination of logs created during build time of debug bui - Created by redirecting output of `adb shell monkey -p im.status.ethereum.debug 1 >`. * `ios_simulators_list.log` - Output from `status-mobile/scripts/run-ios.sh`. - Created by redirecting output of `xcrun simctl list devices -j`. + +# CI + +These log files are uploaded to Jenkins as CI job artifacts on failure using `archiveArtifacts`. + +* `react-native-xcode.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`. + - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj`. +* `Status PR-StatusImPR.log - Created by [Fastlane Gym](https://docs.fastlane.tools/actions/gym/). + - Configred via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`.