Merge branch 'dev' into on
Andrew
1 year ago
commit
0ca55c8f42
@ -0,0 +1,88 @@
|
|||||||
|
local docker_base = 'registry.oxen.rocks/lokinet-ci-';
|
||||||
|
|
||||||
|
// Log a bunch of version information to make it easier for debugging
|
||||||
|
local version_info = {
|
||||||
|
name: 'Version Information',
|
||||||
|
image: docker_base + 'android',
|
||||||
|
commands: [
|
||||||
|
'cmake --version',
|
||||||
|
'apt --installed list'
|
||||||
|
]
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// Intentionally doing a depth of 2 as libSession-util has it's own submodules (and libLokinet likely will as well)
|
||||||
|
local clone_submodules = {
|
||||||
|
name: 'Clone Submodules',
|
||||||
|
image: 'drone/git',
|
||||||
|
commands: ['git fetch --tags', 'git submodule update --init --recursive --depth=2 --jobs=4']
|
||||||
|
};
|
||||||
|
|
||||||
|
// cmake options for static deps mirror
|
||||||
|
local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https://oxen.rocks/deps ' else '');
|
||||||
|
|
||||||
|
[
|
||||||
|
// Unit tests (PRs only)
|
||||||
|
{
|
||||||
|
kind: 'pipeline',
|
||||||
|
type: 'docker',
|
||||||
|
name: 'Unit Tests',
|
||||||
|
platform: { arch: 'amd64' },
|
||||||
|
trigger: { event: { exclude: [ 'push' ] } },
|
||||||
|
steps: [
|
||||||
|
version_info,
|
||||||
|
clone_submodules,
|
||||||
|
{
|
||||||
|
name: 'Run Unit Tests',
|
||||||
|
image: docker_base + 'android',
|
||||||
|
pull: 'always',
|
||||||
|
environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
|
||||||
|
commands: [
|
||||||
|
'apt-get install -y ninja-build',
|
||||||
|
'./gradlew testPlayDebugUnitTestCoverageReport'
|
||||||
|
],
|
||||||
|
}
|
||||||
|
],
|
||||||
|
},
|
||||||
|
// Validate build artifact was created by the direct branch push (PRs only)
|
||||||
|
{
|
||||||
|
kind: 'pipeline',
|
||||||
|
type: 'docker',
|
||||||
|
name: 'Check Build Artifact Existence',
|
||||||
|
platform: { arch: 'amd64' },
|
||||||
|
trigger: { event: { exclude: [ 'push' ] } },
|
||||||
|
steps: [
|
||||||
|
{
|
||||||
|
name: 'Poll for build artifact existence',
|
||||||
|
image: docker_base + 'android',
|
||||||
|
pull: 'always',
|
||||||
|
commands: [
|
||||||
|
'./scripts/drone-upload-exists.sh'
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
// Debug APK build (non-PRs only)
|
||||||
|
{
|
||||||
|
kind: 'pipeline',
|
||||||
|
type: 'docker',
|
||||||
|
name: 'Debug APK Build',
|
||||||
|
platform: { arch: 'amd64' },
|
||||||
|
trigger: { event: { exclude: [ 'pull_request' ] } },
|
||||||
|
steps: [
|
||||||
|
version_info,
|
||||||
|
clone_submodules,
|
||||||
|
{
|
||||||
|
name: 'Build and upload',
|
||||||
|
image: docker_base + 'android',
|
||||||
|
pull: 'always',
|
||||||
|
environment: { SSH_KEY: { from_secret: 'SSH_KEY' }, ANDROID_HOME: '/usr/lib/android-sdk' },
|
||||||
|
commands: [
|
||||||
|
'apt-get install -y ninja-build',
|
||||||
|
'./gradlew assemblePlayDebug',
|
||||||
|
'./scripts/drone-static-upload.sh'
|
||||||
|
],
|
||||||
|
}
|
||||||
|
],
|
||||||
|
}
|
||||||
|
]
|
||||||
@ -0,0 +1,70 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Script used with Drone CI to upload build artifacts (because specifying all this in
|
||||||
|
# .drone.jsonnet is too painful).
|
||||||
|
|
||||||
|
set -o errexit
|
||||||
|
|
||||||
|
if [ -z "$SSH_KEY" ]; then
|
||||||
|
echo -e "\n\n\n\e[31;1mUnable to upload artifact: SSH_KEY not set\e[0m"
|
||||||
|
# Just warn but don't fail, so that this doesn't trigger a build failure for untrusted builds
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$SSH_KEY" >ssh_key
|
||||||
|
|
||||||
|
set -o xtrace # Don't start tracing until *after* we write the ssh key
|
||||||
|
|
||||||
|
chmod 600 ssh_key
|
||||||
|
|
||||||
|
# Define the output paths
|
||||||
|
build_dir="app/build/outputs/apk/play/debug"
|
||||||
|
target_path="${build_dir}/$(ls ${build_dir} | grep -o 'session-[^[:space:]]*-universal.apk')"
|
||||||
|
|
||||||
|
# Validate the paths exist
|
||||||
|
if [ ! -d $build_path ]; then
|
||||||
|
echo -e "\n\n\n\e[31;1mExpected a file to upload, found none\e[0m" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$DRONE_TAG" ]; then
|
||||||
|
# For a tag build use something like `session-android-v1.2.3-universal`
|
||||||
|
base="session-android-$DRONE_TAG-universal"
|
||||||
|
else
|
||||||
|
# Otherwise build a length name from the datetime and commit hash, such as:
|
||||||
|
# session-android-20200522T212342Z-04d7dcc54-universal
|
||||||
|
base="session-android-$(date --date=@$DRONE_BUILD_CREATED +%Y%m%dT%H%M%SZ)-${DRONE_COMMIT:0:9}-universal"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Copy over the build products
|
||||||
|
mkdir -vp "$base"
|
||||||
|
cp -av $target_path "$base"
|
||||||
|
|
||||||
|
# tar dat shiz up yo
|
||||||
|
archive="$base.tar.xz"
|
||||||
|
tar cJvf "$archive" "$base"
|
||||||
|
|
||||||
|
upload_to="oxen.rocks/${DRONE_REPO// /_}/${DRONE_BRANCH// /_}"
|
||||||
|
|
||||||
|
# sftp doesn't have any equivalent to mkdir -p, so we have to split the above up into a chain of
|
||||||
|
# -mkdir a/, -mkdir a/b/, -mkdir a/b/c/, ... commands. The leading `-` allows the command to fail
|
||||||
|
# without error.
|
||||||
|
upload_dirs=(${upload_to//\// })
|
||||||
|
put_debug=
|
||||||
|
mkdirs=
|
||||||
|
dir_tmp=""
|
||||||
|
for p in "${upload_dirs[@]}"; do
|
||||||
|
dir_tmp="$dir_tmp$p/"
|
||||||
|
mkdirs="$mkdirs
|
||||||
|
-mkdir $dir_tmp"
|
||||||
|
done
|
||||||
|
|
||||||
|
sftp -i ssh_key -b - -o StrictHostKeyChecking=off drone@oxen.rocks <<SFTP
|
||||||
|
$mkdirs
|
||||||
|
put $archive $upload_to
|
||||||
|
$put_debug
|
||||||
|
SFTP
|
||||||
|
|
||||||
|
set +o xtrace
|
||||||
|
|
||||||
|
echo -e "\n\n\n\n\e[32;1mUploaded to https://${upload_to}/${archive}\e[0m\n\n\n"
|
||||||
@ -0,0 +1,56 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
|
# Script used with Drone CI to check for the existence of a build artifact.
|
||||||
|
|
||||||
|
if [[ -z ${DRONE_REPO} || -z ${DRONE_PULL_REQUEST} ]]; then
|
||||||
|
echo -e "\n\n\n\n\e[31;1mRequired env variables not specified, likely a tag build so just failing\e[0m\n\n\n"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# This file info MUST match the structure of `base` in the `drone-static-upload.sh` script in
|
||||||
|
# order to function correctly
|
||||||
|
prefix="session-android-"
|
||||||
|
suffix="-${DRONE_COMMIT:0:9}-universal.tar.xz"
|
||||||
|
|
||||||
|
# Extracting head.label using string manipulation
|
||||||
|
echo "Extracting repo information for 'https://api.github.com/repos/${DRONE_REPO}/pulls/${DRONE_PULL_REQUEST}'"
|
||||||
|
pr_info=$(curl -s https://api.github.com/repos/${DRONE_REPO}/pulls/${DRONE_PULL_REQUEST})
|
||||||
|
pr_info_clean=$(echo "$pr_info" | tr -d '[:space:]')
|
||||||
|
head_info=$(echo "$pr_info_clean" | sed -n 's/.*"head"\(.*\)"base".*/\1/p')
|
||||||
|
fork_repo=$(echo "$head_info" | grep -o '"full_name":"[^"]*' | sed 's/"full_name":"//')
|
||||||
|
fork_branch=$(echo "$head_info" | grep -o '"ref":"[^"]*' | sed 's/"ref":"//')
|
||||||
|
upload_dir="https://oxen.rocks/${fork_repo}/${fork_branch}"
|
||||||
|
|
||||||
|
echo "Starting to poll ${upload_dir}/ every 10s to check for a build matching '${prefix}.*${suffix}'"
|
||||||
|
|
||||||
|
# Loop indefinitely the CI can timeout the script if it takes too long
|
||||||
|
total_poll_duration=0
|
||||||
|
max_poll_duration=$((30 * 60)) # Poll for a maximum of 30 mins
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
# Need to add the trailing '/' or else we get a '301' response
|
||||||
|
build_artifacts_html=$(curl -s "${upload_dir}/")
|
||||||
|
|
||||||
|
if [ $? != 0 ]; then
|
||||||
|
echo -e "\n\n\n\n\e[31;1mFailed to retrieve build artifact list\e[0m\n\n\n"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Extract 'session-ios...' titles using grep and awk then look for the target file
|
||||||
|
current_build_artifacts=$(echo "$build_artifacts_html" | grep -o "href=\"${prefix}[^\"]*" | sed 's/href="//')
|
||||||
|
target_file=$(echo "$current_build_artifacts" | grep -o "${prefix}.*${suffix}" | tail -n 1)
|
||||||
|
|
||||||
|
if [ -n "$target_file" ]; then
|
||||||
|
echo -e "\n\n\n\n\e[32;1mExisting build artifact at ${upload_dir}/${target_file}\e[0m\n\n\n"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Sleep for 10 seconds before checking again
|
||||||
|
sleep 10
|
||||||
|
total_poll_duration=$((total_poll_duration + 10))
|
||||||
|
|
||||||
|
if [ $total_poll_duration -gt $max_poll_duration ]; then
|
||||||
|
echo -e "\n\n\n\n\e[31;1mCould not find existing build artifact after polling for 30 minutes\e[0m\n\n\n"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
Loading…
Reference in New Issue