summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authoraguestuser <aguestuser@risup.net>2017-04-23 16:39:03 -0400
committeraguestuser <aguestuser@risup.net>2017-04-30 20:05:35 -0400
commite79058d8797c918d37e406245ca7683cf07240d1 (patch)
tree3229f9f4eef202fd1cf1f5a039af74ea8aa9f375 /.gitlab-ci.yml
parenta7b4f463e4ffc282814ef74daf18c74581fc3a7d (diff)
[ag] Fix native build step with revised dockerfile
* PROBLEM: * most recent version (r14b) of `android-ndk` uses `clang` for cross-compilation * BUT: `openssl` cannot compile successfully w/ `clang` * AND: we depend on `openssl` transitively through `ics-openvpn` while trying to use `android-ndk` r14b * FIX: * downgrade to `android-ndk` (12b) (most recent versoin that still uses `gcc` instead of `clang`) * modify some of the default * REMAINING PROBLEMS: * some string translations for Jamaica now break the build (unclear why -- outdated country abbreviation? ja for jm???) * we are now using a version of ndk that is 2 versions old and a version of ics-openvpn (pinned to a 3.1.2016 commit via submodule) that depends on an outdated version of `openssl`, which raises security concerns. updating to the most recent version will force us to wade into all the dependency problems amongst `ics-openvpn`/`openssl`/`ndk` * REFERENCES: * on `openssl` incompatibility w/ clang: https://github.com/openssl/openssl/pull/2229 * on `ics-openvpn` problems with `ndk`: https://github.com/android-ndk/ndk/issues/144
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ad57573..920f65d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,12 @@
+# NOTE(@aguestuser|4.23.17):
+# - we would prefer 0xacab.org:4567/leap/bitmask_android:android-sdk
+# as the build image, but cant do that presently b/c:
+# (1) i do not have permissions to create docker repositories in this repo
+# (2) we need to add whatever image we use to gitlab ci's whitelist
+# or else we get a message like:
+# `ERROR: The 0xacab.org:4567/aguestuser/bitmask_android:android-sdk-25 is not present on list of allowed images`
+
image: "0xacab.org:4567/leap/gitlab-buildpackage:android"
-#image: "gfx2015/android"
stages:
- build