Tweaks to docker image definition

This commit is contained in:
Morgan Pretty 2024-02-07 13:51:01 +11:00
parent 3603ba0403
commit 5d6397764f

View File

@ -1,3 +1,5 @@
local docker_base = 'registry.oxen.rocks/lokinet-ci-';
// Log a bunch of version information to make it easier for debugging // Log a bunch of version information to make it easier for debugging
local version_info = { local version_info = {
name: 'Version Information', name: 'Version Information',
@ -29,7 +31,7 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
clone_submodules, clone_submodules,
{ {
name: 'Run Unit Tests', name: 'Run Unit Tests',
image: 'registry.oxen.rocks/lokinet-ci-android', image: docker_base + 'android',
environment: { ANDROID: 'android' }, environment: { ANDROID: 'android' },
commands: [ commands: [
'./gradlew testPlayDebugUnitTestCoverageReport' './gradlew testPlayDebugUnitTestCoverageReport'
@ -47,6 +49,7 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
steps: [ steps: [
{ {
name: 'Poll for build artifact existence', name: 'Poll for build artifact existence',
image: docker_base + 'android',
commands: [ commands: [
'./Scripts/drone-upload-exists.sh' './Scripts/drone-upload-exists.sh'
] ]
@ -65,7 +68,7 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
clone_submodules, clone_submodules,
{ {
name: 'Build', name: 'Build',
image: 'registry.oxen.rocks/lokinet-ci-android', image: docker_base + 'android',
environment: { ANDROID: 'android' }, environment: { ANDROID: 'android' },
commands: [ commands: [
'./gradlew assemblePlayDebug' './gradlew assemblePlayDebug'
@ -73,6 +76,7 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
}, },
{ {
name: 'Upload artifacts', name: 'Upload artifacts',
image: docker_base + 'android',
environment: { SSH_KEY: { from_secret: 'SSH_KEY' } }, environment: { SSH_KEY: { from_secret: 'SSH_KEY' } },
commands: [ commands: [
'./Scripts/drone-static-upload.sh' './Scripts/drone-static-upload.sh'