Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Gitlab CI Android improve configurability

Browse Source 
Enable passing RS_SERVICE_QMAKE_EXTRA_OPTS from environement so it can
  be set from project settings according to project and forks needs
This commit is contained in:
Gioacchino Mazzurco 2021-11-10 10:10:30 +01:00
parent 1d2b91a675
commit ff68faf34a
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -75,6 +75,7 @@ build-android-arm-apk:
- > - >
docker build -t retroshare:android_arm_latest docker build -t retroshare:android_arm_latest
$($CI_PROJECT_DIR/build_scripts/GitlabCI/getRepoArgs.sh) $($CI_PROJECT_DIR/build_scripts/GitlabCI/getRepoArgs.sh)
--build-arg RS_SERVICE_QMAKE_EXTRA_OPTS="$RS_SERVICE_QMAKE_EXTRA_OPTS"
--file $CI_PROJECT_DIR/build_scripts/GitlabCI/Android.Dockerfile --file $CI_PROJECT_DIR/build_scripts/GitlabCI/Android.Dockerfile
Dockercontext Dockercontext
# see https://stackoverflow.com/a/59055906 # see https://stackoverflow.com/a/59055906
@ -96,6 +97,7 @@ build-android-arm64-apk:
$($CI_PROJECT_DIR/build_scripts/GitlabCI/getRepoArgs.sh) $($CI_PROJECT_DIR/build_scripts/GitlabCI/getRepoArgs.sh)
--build-arg ANDROID_PLATFORM_VER=21 --build-arg ANDROID_PLATFORM_VER=21
--build-arg ANDROID_NDK_ARCH=arm64 --build-arg ANDROID_NDK_ARCH=arm64
--build-arg RS_SERVICE_QMAKE_EXTRA_OPTS="$RS_SERVICE_QMAKE_EXTRA_OPTS"
--file $CI_PROJECT_DIR/build_scripts/GitlabCI/Android.Dockerfile --file $CI_PROJECT_DIR/build_scripts/GitlabCI/Android.Dockerfile
Dockercontext Dockercontext
- > - >