From e3ab26dc4c114969d94b5678c396fee903180469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Tue, 19 May 2020 12:06:57 +0300 Subject: [PATCH 1/2] remove old Dockerfile --- Dockerfile | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index fed2125..0000000 --- a/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -ARG DOCKER_PREFIX=wapmobil/ -FROM ${DOCKER_PREFIX}android - -ARG LIBS_BUILD_NUMBER=9999 -ARG JOBS_COUNT=4 -WORKDIR /soft -#RUN svn co svn://db.shs.com.ru/libs --username peri4 --password a --no-auth-cache --non-interactive --trust-server-cert -RUN git clone -b release --depth 1 --recursive https://git.shs.tools/SHS/libs.git - -WORKDIR /soft/build_libs_linux -RUN cmake -DICU=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * \ - && ldconfig - -WORKDIR /soft/build_libs_windows -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLIB=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -WORKDIR /soft/build_libs_macos -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLIB=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -ENV _ANDROID_TOOLCHAIN=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake -ENV _CUR_ABI=armeabi-v7a -WORKDIR /soft/build_libs_android_${_CUR_ABI} -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -ENV _CUR_ABI=arm64-v8a -WORKDIR /soft/build_libs_android_${_CUR_ABI} -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -ENV _CUR_ABI=x86 -WORKDIR /soft/build_libs_android_${_CUR_ABI} -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -ENV _CUR_ABI=x86_64 -WORKDIR /soft/build_libs_android_${_CUR_ABI} -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -WORKDIR /soft/src - -# examples -# docker build --no-cache -t libs . -# cd -# docker run --rm -it -v $(pwd):/soft/src libs bash From 68945371f50ab22d54b4639bafae7bde3596d7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Tue, 19 May 2020 16:19:30 +0300 Subject: [PATCH 2/2] Jenkinsfile stage download --- Jenkinsfile | 8 +++----- pip | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e4ffc2c..07c840b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,13 +11,14 @@ def build_docker(name) { } def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}" dir ("docker/${image}") { - //echo "build ${image} ${args}" sh "docker build ${args} --no-cache -t ${image} ." } return "\n - ${image}" } node { - checkout scm + stage("Download SRC") { + checkout scm + } def _envmap = [:] def _env = sh(script: "env", returnStdout: true).trim().split("\n") _env.each{ l -> @@ -26,12 +27,9 @@ node { def _v = l.substring(_ind + 1); _envmap["${_n}"] = "${_v}"; } - //println "done!" - //println "${_envmap}" def _msg = "Built images:" def platforms = ['debian', 'osx', 'windows', 'android', 'pi'] for (int i = 0; i < platforms.size(); ++i) { - //echo "check BUILD_${platforms[i]} -> ${_v}" if (_envmap["BUILD_${platforms[i]}"] == "1") { stage("${platforms[i]}-libs") { _msg += build_docker("${platforms[i]}") diff --git a/pip b/pip index b860d8b..1899832 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b860d8bbafcde76290321b3e1b79b8ec400e0700 +Subproject commit 18998323629d04af96335621656d2197922e548e