Skip to content

Commit d135178

Browse files
committed
chore: update ios/logs to logs dir
fixes #18915 In this PR #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.
1 parent 42d2690 commit d135178

File tree

5 files changed

+19
-23
lines changed

5 files changed

+19
-23
lines changed

ci/Jenkinsfile.ios

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ pipeline {
6363
}
6464
post {
6565
failure {
66-
archiveArtifacts 'ios/logs/*'
66+
archiveArtifacts 'logs/*'
6767
}
6868
}
6969
}

fastlane/Fastfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# This file contains the fastlane.tools configuration
2+
23
# You can find the documentation at https://docs.fastlane.tools
34
#
45
# For a list of all available actions, check out
@@ -96,7 +97,7 @@ end
9697
# if false - read list of devices from AppStoreConnect, and upgrade the provisioning profiles from it
9798
# `pr_build`:
9899
# if true - uses StatusImPR scheme and postfixed app id with `.pr` to build an app, which can be used in parallel with release
99-
# if false - uses StatusIm scheme to build the release app
100+
# if false - uses StatusIm scheme to build the release app
100101

101102
def build_ios_adhoc(readonly: false, pr_build: false)
102103
# PR builds should appear as a separate App on iOS
@@ -123,7 +124,7 @@ def build_ios_adhoc(readonly: false, pr_build: false)
123124
export_method: 'ad-hoc',
124125
output_name: 'StatusIm',
125126
output_directory: 'status-ios',
126-
buildlog_path: 'ios/logs',
127+
buildlog_path: 'logs',
127128
export_options: {
128129
signingStyle: 'manual',
129130
provisioningProfiles: {

ios/StatusIm.xcodeproj/project.pbxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -542,7 +542,7 @@
542542
);
543543
runOnlyForDeploymentPostprocessing = 0;
544544
shellPath = "/usr/bin/env sh";
545-
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";
545+
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";
546546
};
547547
28606042DA81A750949525E4 /* [CP] Copy Pods Resources */ = {
548548
isa = PBXShellScriptBuildPhase;
@@ -578,7 +578,7 @@
578578
);
579579
runOnlyForDeploymentPostprocessing = 0;
580580
shellPath = "/usr/bin/env sh";
581-
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";
581+
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";
582582
};
583583
3AAD2AD724A3A60E0075D594 /* Run Script */ = {
584584
isa = PBXShellScriptBuildPhase;
@@ -592,7 +592,7 @@
592592
);
593593
runOnlyForDeploymentPostprocessing = 1;
594594
shellPath = "/usr/bin/env sh";
595-
shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
595+
shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ${PROJECT_DIR}/../logs/set_xcode_version.log\" 2>&1";
596596
};
597597
523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */ = {
598598
isa = PBXShellScriptBuildPhase;
@@ -716,7 +716,7 @@
716716
);
717717
runOnlyForDeploymentPostprocessing = 1;
718718
shellPath = "/usr/bin/env sh";
719-
shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
719+
shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > "${PROJECT_DIR}/../logs/set_xcode_version.log\" 2>&1";
720720
};
721721
/* End PBXShellScriptBuildPhase section */
722722

ios/logs/README.md

-14
This file was deleted.

logs/README.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Description
22

3-
This directory is the destination of logs created during build time of debug builds.
3+
This directory is the destination of logs created during build time of debug builds and logs created by Fastlane on CI.
44

55
# Logs
66

@@ -16,3 +16,12 @@ This directory is the destination of logs created during build time of debug bui
1616
- Created by redirecting output of `adb shell monkey -p im.status.ethereum.debug 1 >`.
1717
* `ios_simulators_list.log` - Output from `status-mobile/scripts/run-ios.sh`.
1818
- Created by redirecting output of `xcrun simctl list devices -j`.
19+
20+
# CI
21+
22+
These log files are uploaded to Jenkins as CI job artifacts on failure using `archiveArtifacts`.
23+
24+
* `react-native-xcode.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`.
25+
- Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj`.
26+
* `Status PR-StatusImPR.log - Created by [Fastlane Gym](https://docs.fastlane.tools/actions/gym/).
27+
- Configred via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`.

0 commit comments

Comments
 (0)