mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-25 02:55:23 +00:00
Further tweaks
This commit is contained in:
parent
7652594eed
commit
1f4dd6f3df
@ -18,14 +18,6 @@ local clone_submodules = {
|
|||||||
commands: ['git fetch --tags', 'git submodule update --init --recursive --depth=2 --jobs=4']
|
commands: ['git fetch --tags', 'git submodule update --init --recursive --depth=2 --jobs=4']
|
||||||
};
|
};
|
||||||
|
|
||||||
// Install dependencies
|
|
||||||
local install_dependencies = {
|
|
||||||
name: 'Install Dependencies',
|
|
||||||
image: docker_base + 'android',
|
|
||||||
commands: ['apt-get install -y ninja-build']
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
// cmake options for static deps mirror
|
// cmake options for static deps mirror
|
||||||
local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https://oxen.rocks/deps ' else '');
|
local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https://oxen.rocks/deps ' else '');
|
||||||
|
|
||||||
@ -40,13 +32,13 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
|
|||||||
steps: [
|
steps: [
|
||||||
version_info,
|
version_info,
|
||||||
clone_submodules,
|
clone_submodules,
|
||||||
install_dependencies,
|
|
||||||
{
|
{
|
||||||
name: 'Run Unit Tests',
|
name: 'Run Unit Tests',
|
||||||
image: docker_base + 'android',
|
image: docker_base + 'android',
|
||||||
pull: 'always',
|
pull: 'always',
|
||||||
environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
|
environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
|
||||||
commands: [
|
commands: [
|
||||||
|
'apt-get install -y ninja-build',
|
||||||
'./gradlew testPlayDebugUnitTestCoverageReport'
|
'./gradlew testPlayDebugUnitTestCoverageReport'
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
@ -80,25 +72,17 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
|
|||||||
steps: [
|
steps: [
|
||||||
version_info,
|
version_info,
|
||||||
clone_submodules,
|
clone_submodules,
|
||||||
install_dependencies,
|
|
||||||
{
|
{
|
||||||
name: 'Build',
|
name: 'Build and upload',
|
||||||
image: docker_base + 'android',
|
image: docker_base + 'android',
|
||||||
pull: 'always',
|
pull: 'always',
|
||||||
environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
|
environment: { SSH_KEY: { from_secret: 'SSH_KEY' }, ANDROID_HOME: '/usr/lib/android-sdk' },
|
||||||
commands: [
|
|
||||||
'./gradlew assemblePlayDebug'
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'Upload artifacts',
|
|
||||||
image: docker_base + 'android',
|
|
||||||
pull: 'always',
|
|
||||||
environment: { SSH_KEY: { from_secret: 'SSH_KEY' } },
|
|
||||||
commands: [
|
commands: [
|
||||||
|
'apt-get install -y ninja-build',
|
||||||
|
'./gradlew assemblePlayDebug',
|
||||||
'./scripts/drone-static-upload.sh'
|
'./scripts/drone-static-upload.sh'
|
||||||
]
|
],
|
||||||
},
|
}
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
]
|
]
|
Loading…
Reference in New Issue
Block a user