The branch, master has been updated
via 6220259 gitlab-ci: Add Ubuntu runner
via 77dbdf2 gitlab-ci: Remove debian cross mips build
from 12a7093 Bump version to 1.1.6
https://git.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6220259a0522c4c0c85e3e1ea3fa662349f106b8
Author: Andreas Schneider <a...@samba.org>
Date: Tue Mar 24 10:45:45 2020 +0100
gitlab-ci: Add Ubuntu runner
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
commit 77dbdf25bf7de0bd1a5ac494d37884bf598bc8a9
Author: Andreas Schneider <a...@samba.org>
Date: Tue Mar 24 10:44:38 2020 +0100
gitlab-ci: Remove debian cross mips build
This isn't supported by Debian anymore.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 44 +++++++++++++++++++-------------------------
1 file changed, 19 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90558b6..e3b028c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ variables:
CENTOS7_BUILD: buildenv-centos7
TUMBLEWEED_BUILD: buildenv-tumbleweed
MINGW_BUILD: buildenv-mingw
- DEBIAN_CROSS_BUILD: buildenv-debian-cross
+ UBUNTU_BUILD: buildenv-ubuntu
centos7/x86_64:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$CENTOS7_BUILD
@@ -135,30 +135,6 @@ freebsd/x86_64:
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_TOOLCHAIN_FILE=../cmake/Toolchain-Debian-mips.cmake
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
- -DUNIT_TESTING=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/x86_64/gcc:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$TUMBLEWEED_BUILD
script:
@@ -235,3 +211,21 @@ tumbleweed/static-analysis:
when: on_failure
paths:
- obj/scan
+
+ubuntu/x86_64:
+ image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$UBUNTU_BUILD
+ script:
+ - mkdir -p obj && cd obj && cmake
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DPICKY_DEVELOPER=ON
+ -DUNIT_TESTING=ON .. &&
+ make -j$(nproc) && ctest --output-on-failure
+ tags:
+ - shared
+ except:
+ - tags
+ artifacts:
+ expire_in: 1 week
+ when: on_failure
+ paths:
+ - obj/
--
Resolv Wrapper Repository
