From 927f8206f5dc800edb35f7d0347665bbbf92b361 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Fri, 5 Apr 2024 17:17:23 +1100 Subject: [PATCH] Update to the latest build config --- .drone.jsonnet | 93 +++++++------------ Scripts/clean-up-old-test-simulators.sh | 81 ++++++++++++++++ .../xcshareddata/xcschemes/Session.xcscheme | 1 + codecov.yml | 1 + 4 files changed, 116 insertions(+), 60 deletions(-) create mode 100755 Scripts/clean-up-old-test-simulators.sh diff --git a/.drone.jsonnet b/.drone.jsonnet index a02ef39af..bd06b45c3 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -7,32 +7,15 @@ local version_info = { commands: [ 'git --version', 'LANG=en_US.UTF-8 pod --version', - 'xcodebuild -version' + 'xcodebuild -version', + 'xcbeautify --version' ] }; // Intentionally doing a depth of 2 as libSession-util has it's own submodules (and libLokinet likely will as well) -local custom_clone = { - name: 'Clone Repo', - environment: { CLONE_KEY: { from_secret: 'CLONE_KEY' } }, - commands: [ - ||| - if [ -z "$CLONE_KEY" ]; then - echo -e "\n\n\n\e[31;1mUnable to checkout repo: CLONE_KEY not set\e[0m" - exit 1 - fi - |||, - 'mkdir -p $HOME/.ssh && touch $HOME/.ssh/config && touch $HOME/.ssh/known_hosts', - 'echo "$CLONE_KEY" > $HOME/.ssh/id_ed25519_drone_ci_deploy', - 'chmod 600 $HOME/.ssh/config $HOME/.ssh/known_hosts $HOME/.ssh/id_ed25519_drone_ci_deploy', - 'ssh-keyscan -t ed25519 github.com >> $HOME/.ssh/known_hosts', - 'export GIT_SSH_COMMAND="ssh -i $HOME/.ssh/id_ed25519_drone_ci_deploy -F $HOME/.ssh/config -o UserKnownHostsFile=$HOME/.ssh/known_hosts"', - 'git -c init.defaultBranch=master init', - 'git remote add origin $DRONE_GIT_SSH_URL', - 'git fetch --depth=1 origin +$DRONE_COMMIT_REF', - 'git checkout $DRONE_COMMIT -b $DRONE_BRANCH', - 'git submodule update --init --recursive --depth=2 --jobs=4' - ] +local clone_submodules = { + name: 'Clone Submodules', + commands: [ 'git submodule update --init --recursive --depth=2 --jobs=4' ] }; // cmake options for static deps mirror @@ -44,9 +27,9 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/ // 'LANG' env var so we need to work around the with https://github.com/CocoaPods/CocoaPods/issues/6333 local install_cocoapods = { name: 'Install CocoaPods', - commands: [' - LANG=en_US.UTF-8 pod install || rm -rf ./Pods && LANG=en_US.UTF-8 pod install - '], + commands: [ + 'LANG=en_US.UTF-8 pod install || (rm -rf ./Pods && LANG=en_US.UTF-8 pod install)' + ], depends_on: [ 'Load CocoaPods Cache' ] @@ -76,7 +59,7 @@ local load_cocoapods_cache = { 'rm -f /Users/drone/.cocoapods_cache.lock' ], depends_on: [ - 'Clone Repo' + 'Clone Submodules' ] }; @@ -98,8 +81,7 @@ local update_cocoapods_cache(depends_on) = { 'touch /Users/drone/.cocoapods_cache.lock', ||| if [[ -d ./Pods ]]; then - rm -rf /Users/drone/.cocoapods_cache - cp -r ./Pods /Users/drone/.cocoapods_cache + rsync -a --delete ./Pods/ /Users/drone/.cocoapods_cache fi |||, 'rm -f /Users/drone/.cocoapods_cache.lock' @@ -115,27 +97,32 @@ local update_cocoapods_cache(depends_on) = { name: 'Unit Tests', platform: { os: 'darwin', arch: 'arm64' }, trigger: { event: { exclude: [ 'push' ] } }, - clone: { disable: true }, steps: [ version_info, - custom_clone, + clone_submodules, load_cocoapods_cache, install_cocoapods, + { + name: 'Clean Up Old Test Simulators', + commands: [ + './Scripts/clean-up-old-test-simulators.sh' + ] + }, { name: 'Pre-Boot Test Simulator', commands: [ 'mkdir -p build/artifacts', 'echo "Test-iPhone14-${DRONE_COMMIT:0:9}-${DRONE_BUILD_EVENT}" > ./build/artifacts/device_name', - 'xcrun simctl create "$(cat ./build/artifacts/device_name)" com.apple.CoreSimulator.SimDeviceType.iPhone-14', - 'echo $(xcrun simctl list devices | grep -m 1 $(cat ./build/artifacts/device_name) | grep -E -o -i "([0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12})") > ./build/artifacts/sim_uuid', - 'xcrun simctl boot $(cat ./build/artifacts/sim_uuid)', - 'echo "Pre-booting simulator complete: $(xcrun simctl list | sed "s/^[[:space:]]*//" | grep -o ".*$(cat ./build/artifacts/sim_uuid).*")"', + 'xcrun simctl create "$(<./build/artifacts/device_name)" com.apple.CoreSimulator.SimDeviceType.iPhone-14', + 'echo $(xcrun simctl list devices | grep -m 1 $(<./build/artifacts/device_name) | grep -E -o -i "([0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12})") > ./build/artifacts/sim_uuid', + 'xcrun simctl boot $(<./build/artifacts/sim_uuid)', + 'echo "Pre-booting simulator complete: $(xcrun simctl list | sed "s/^[[:space:]]*//" | grep -o ".*$(<./build/artifacts/sim_uuid).*")"', ] }, { name: 'Build and Run Tests', commands: [ - 'NSUnbufferedIO=YES set -o pipefail && xcodebuild test -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -resultBundlePath ./build/artifacts/testResults.xcresult -parallelizeTargets -destination "platform=iOS Simulator,id=$(cat ./build/artifacts/sim_uuid)" -parallel-testing-enabled NO -test-timeouts-enabled YES -maximum-test-execution-time-allowance 10 -collect-test-diagnostics never 2>&1 | xcbeautify --is-ci', + 'NSUnbufferedIO=YES set -o pipefail && xcodebuild test -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -resultBundlePath ./build/artifacts/testResults.xcresult -parallelizeTargets -destination "platform=iOS Simulator,id=$(<./build/artifacts/sim_uuid)" -parallel-testing-enabled NO -test-timeouts-enabled YES -maximum-test-execution-time-allowance 10 -collect-test-diagnostics never 2>&1 | xcbeautify --is-ci', ], depends_on: [ 'Pre-Boot Test Simulator', @@ -158,28 +145,19 @@ local update_cocoapods_cache(depends_on) = { status: ['failure', 'success'] } }, - { - name: 'Delete Test Simulator', - commands: [ - ||| - if [[ -f ./build/artifacts/sim_uuid ]]; then - xcrun simctl delete $(cat ./build/artifacts/sim_uuid) - fi - |||, - ], - depends_on: [ - 'Build and Run Tests', - ], - when: { - status: ['failure', 'success'] - } - }, update_cocoapods_cache(['Build and Run Tests']), { name: 'Install Codecov CLI', commands: [ + 'mkdir -p build/artifacts', 'pip3 install codecov-cli', - '~/Library/Python/3.9/bin/codecovcli --version' + 'find $HOME/Library/Python -name codecovcli -print -quit > ./build/artifacts/codecov_path', + ||| + if [[ ! -s ./build/artifacts/codecov_path ]]; then + which codecovcli > ./build/artifacts/codecov_path + fi + |||, + '$(<./build/artifacts/codecov_path) --version' ], }, { @@ -190,9 +168,10 @@ local update_cocoapods_cache(depends_on) = { depends_on: ['Build and Run Tests'] }, { + // No token needed for public repos name: 'Upload coverage to Codecov', commands: [ - '~/Library/Python/3.9/bin/codecovcli upload-process --fail-on-error -f ./build/artifacts/coverage.xml', + '$(<./build/artifacts/codecov_path) upload-process --fail-on-error -f ./build/artifacts/coverage.xml', ], depends_on: [ 'Convert xcresult to xml', @@ -208,16 +187,11 @@ local update_cocoapods_cache(depends_on) = { name: 'Check Build Artifact Existence', platform: { os: 'darwin', arch: 'arm64' }, trigger: { event: { exclude: [ 'push' ] } }, - clone: { disable: true }, steps: [ - custom_clone, { name: 'Poll for build artifact existence', commands: [ './Scripts/drone-upload-exists.sh' - ], - depends_on: [ - 'Clone Repo' ] } ] @@ -229,10 +203,9 @@ local update_cocoapods_cache(depends_on) = { name: 'Simulator Build', platform: { os: 'darwin', arch: 'arm64' }, trigger: { event: { exclude: [ 'pull_request' ] } }, - clone: { disable: true }, steps: [ version_info, - custom_clone, + clone_submodules, load_cocoapods_cache, install_cocoapods, { diff --git a/Scripts/clean-up-old-test-simulators.sh b/Scripts/clean-up-old-test-simulators.sh new file mode 100755 index 000000000..2437a2dcf --- /dev/null +++ b/Scripts/clean-up-old-test-simulators.sh @@ -0,0 +1,81 @@ +#!/usr/bin/env bash +# +# Script used with Drone CI to delete any test simulators created by the pipeline that are older than 1 +# hour (the timeout for iOS builds) to ensure we don't waste too much HDD space with test simulators. + +dir="$HOME/Library/Developer/CoreSimulator/Devices" + +# The $HOME directory for a drone pipeline won't be the directory the simulators are stored in so +# check if it exists and if not, fallback to a hard-coded directory +if [[ ! -d $dir ]]; then + dir="/Users/drone/Library/Developer/CoreSimulator/Devices" +fi + +# Plist file +plist="${dir}/device_set.plist" + +if [[ ! -f ${plist} ]]; then + echo -e "\e[31;1mXCode Simulator list not found.\e[0m" + exit 1 +fi + +# Delete any unavailable simulators +xcrun simctl delete unavailable + +# Extract all UUIDs from the device_set +uuids=$(grep -Eo '[A-F0-9]{8}-([A-F0-9]{4}-){3}[A-F0-9]{12}' "$plist") + +# Create empty arrays to store the outputs +uuids_to_keep=() +uuids_to_ignore=() +uuids_to_remove=() + +# Find directories older than an hour +while read -r child_dir; do + # Get the last component of the directory path + dir_name=$(basename "$child_dir") + + # If the folder is not in the uuids array then add it to the uuids_to_remove + # array, otherwise add it to uuids_to_ignore + if ! echo "$uuids" | grep -q "$dir_name"; then + uuids_to_remove+=("$dir_name") + else + uuids_to_ignore+=("$dir_name") + fi +done < <(find "$dir" -maxdepth 1 -type d -not -path "$dir" -mmin +60) + +# Find directories newer than an hour +while read -r child_dir; do + # Get the last component of the directory path + dir_name=$(basename "$child_dir") + + # If the folder is not in the uuids array then add it to the uuids_to_keep array + if ! echo "$uuids" | grep -q "$dir_name"; then + uuids_to_keep+=("$dir_name") + fi +done < <(find "$dir" -maxdepth 1 -type d -not -path "$dir" -mmin -60) + +# Delete the simulators +if [ ${#uuids_to_remove[@]} -eq 0 ]; then + echo -e "\e[31mNo simulators to delete\e[0m" +else + echo -e "\e[31mDeleting ${#uuids_to_remove[@]} old test simulators:\e[0m" + for uuid in "${uuids_to_remove[@]}"; do + echo -e "\e[31m $uuid\e[0m" + # xcrun simctl delete "$uuid" + done +fi + +# Output the pipeline simulators we are leaving +if [ ${#uuids_to_keep[@]} -gt 0 ]; then + echo -e "\e[33m\nIgnoring ${#uuids_to_keep[@]} test simulators (might be in use):\e[0m" + for uuid in "${uuids_to_keep[@]}"; do + echo -e "\e[33m $uuid\e[0m" + done +fi + +# Output the remaining Xcode Simulators +echo -e "\e[32m\nIgnoring ${#uuids_to_ignore[@]} Xcode simulators:\e[0m" +for uuid in "${uuids_to_ignore[@]}"; do + echo -e "\e[32m $uuid\e[0m" +done \ No newline at end of file diff --git a/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme b/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme index 8940ad0b2..22887c56e 100644 --- a/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme +++ b/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme @@ -55,6 +55,7 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "NO" + codeCoverageEnabled = "YES" onlyGenerateCoverageForSpecifiedTargets = "YES">