diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 710e4b9f..5743c199 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: CENTOS7_BUILD: buildenv-centos7 TUMBLEWEED_BUILD: buildenv-tumbleweed MINGW_BUILD: buildenv-mingw - DEBIAN_CROSS_BUILD: buildenv-debian-cross # pkd tests fail on CentOS7 docker images, so we don't use -DSERVER_TESTING=ON centos7/openssl_1.0.x/x86_64: @@ -297,33 +296,6 @@ fedora/mingw32: paths: - obj/ -.Debian.cross.template: &Debian_cross_template - stage: test - image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_CROSS_BUILD - script: - - build=$(dpkg-architecture -qDEB_HOST_GNU_TYPE) - - host="${CI_JOB_NAME#*.cross.}" - - mkdir -p obj && cd obj && cmake - -DCMAKE_C_COMPILER="$(which $host-gcc)" - -DCMAKE_CXX_COMPILER="$(which $host-g++)" - -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DUNIT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON - -DWITH_PCAP=ON .. && - make -j$(nproc) && - ctest --output-on-failure - tags: - - shared - except: - - tags - artifacts: - expire_in: 1 week - when: on_failure - paths: - - obj/ - -.Debian.cross.mips-linux-gnu: - <<: *Debian_cross_template - tumbleweed/openssl_1.1.x/x86_64/gcc: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$TUMBLEWEED_BUILD script: