diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..c3f791a1db51c8eefd69586583934adc7349f06b --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,18 @@ +stages: + - build_docker + +build: + stage: build_docker + image: docker + services: + - docker:dind + before_script: + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + script: + - docker pull $CI_REGISTRY_IMAGE:android_arm64 || true + - docker build + --cache-from $CI_REGISTRY_IMAGE:android_arm64 + --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA + --tag $CI_REGISTRY_IMAGE:android_arm64 + 6.3-android-aqt + - docker push $CI_REGISTRY_IMAGE:android_arm64 diff --git a/6.3-android-aqt/get_qt.sh b/6.3-android-aqt/get_qt.sh index a7e13b2ebe2205840aefdf2e951d47dfac8379fd..12090576def1ad4293136f282cbc8c4c02dcba98 100755 --- a/6.3-android-aqt/get_qt.sh +++ b/6.3-android-aqt/get_qt.sh @@ -29,11 +29,13 @@ echo echo '--> Download & install the Qt library using aqt' echo -for abi in armv7 arm64_v8a x86 x86_64; do +for abi in arm64_v8a; do aqt install-qt -O "$QT_PATH" linux android "$QT_VERSION" "android_$abi" done + aqt install-tool -O "$QT_PATH" linux desktop tools_cmake aqt install-tool -O "$QT_PATH" linux desktop tools_ninja + # Host Qt needed for cross-compilation aqt install-qt -O "$QT_PATH" linux desktop "$QT_VERSION" gcc_64