The branch, master has been updated
via 2b486d5 Drop support for Python 2
via 7932e58 gitlab-ci: Introduce test stages
via 1c924d4 gitlab-ci: Change the obj-dir so it doesn't create problems
via 514610b gitlab-ci: Fix indentation found by yamllint
from d938a84 Bump version to 1.1.4
https://git.samba.org/?p=pam_wrapper.git;a=shortlog;h=master
- Log -
commit 2b486d5eb124562460a91e49eaf7bbef6fd3d168
Author: Andreas Schneider
Date: Tue Aug 2 09:21:55 2022 +0200
Drop support for Python 2
Python 2 is already EOL!
Signed-off-by: Andreas Schneider
Reviewed-by: Ralph Boehme
commit 7932e582ec0e4332ee417fbddfab3516e9ed575a
Author: Andreas Schneider
Date: Tue Aug 2 11:45:05 2022 +0200
gitlab-ci: Introduce test stages
Signed-off-by: Andreas Schneider
Reviewed-by: Ralph Boehme
commit 1c924d3eb8f9065145c256a2e796069563e4
Author: Andreas Schneider
Date: Tue Aug 2 11:55:02 2022 +0200
gitlab-ci: Change the obj-dir so it doesn't create problems
The artifacts seem to be downloaded in the analysis stage if something
fails in the test stage. This should fix it for now.
Reviewed-by: Ralph Boehme
commit 514610bcc4a8825b36cbbb838c496657e0b99bef
Author: Andreas Schneider
Date: Tue Aug 2 11:40:42 2022 +0200
gitlab-ci: Fix indentation found by yamllint
Signed-off-by: Andreas Schneider
Reviewed-by: Ralph Boehme
---
Summary of changes:
.gitlab-ci.yml| 209 +-
src/python/CMakeLists.txt | 3 +-
src/python/python2/CMakeLists.txt | 45
tests/CMakeLists.txt | 9 --
tests/pypamtest_test.py | 14 +--
5 files changed, 121 insertions(+), 159 deletions(-)
delete mode 100644 src/python/python2/CMakeLists.txt
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1439b2c..c205528 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,4 @@
+---
variables:
GIT_DEPTH: 3
BUILD_IMAGES_PROJECT: cmocka/gitlab-build-images
@@ -6,18 +7,24 @@ variables:
TUMBLEWEED_BUILD: buildenv-tumbleweed
UBUNTU_BUILD: buildenv-ubuntu
+stages:
+ - build
+ - test
+ - analysis
+
centos7/x86_64:
+ stage: test
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$CENTOS7_BUILD
script:
- - mkdir -p obj && cd obj && cmake3
--DCMAKE_BUILD_TYPE=RelWithDebInfo
--DPICKY_DEVELOPER=ON
--DUNIT_TESTING=ON .. &&
-make -j$(nproc) && ctest --output-on-failure
+- mkdir -p obj && cd obj && cmake3
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DPICKY_DEVELOPER=ON
+ -DUNIT_TESTING=ON .. &&
+ make -j$(nproc) && ctest --output-on-failure
tags:
- - shared
+- shared
except:
- - tags
+- tags
artifacts:
expire_in: 1 week
when: on_failure
@@ -25,18 +32,19 @@ centos7/x86_64:
- obj/
fedora/x86_64:
+ stage: test
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- - mkdir -p obj && cd obj && cmake
--DCMAKE_INSTALL_PREFIX=/tmp/local
--DCMAKE_BUILD_TYPE=RelWithDebInfo
--DPICKY_DEVELOPER=ON
--DUNIT_TESTING=ON .. &&
-make -j$(nproc) && ctest --output-on-failure && make install
+- mkdir -p obj && cd obj && cmake
+ -DCMAKE_INSTALL_PREFIX=/tmp/local
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DPICKY_DEVELOPER=ON
+ -DUNIT_TESTING=ON .. &&
+ make -j$(nproc) && ctest --output-on-failure && make install
tags:
- - shared
+- shared
except:
- - tags
+- tags
artifacts:
expire_in: 1 week
when: on_failure
@@ -44,17 +52,18 @@ fedora/x86_64:
- obj/
fedora/address-sanitizer:
+ stage: build
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- - mkdir -p obj && cd obj && cmake
--DCMAKE_BUILD_TYPE=AddressSanitizer
--DPICKY_DEVELOPER=ON
--DUNIT_TESTING=ON .. &&
-make -j$(nproc) && ctest --output-on-failure
+- mkdir -p obj && cd obj && cmake
+ -DCMAKE_BUILD_TYPE=AddressSanitizer
+ -DPICKY_DEVELOPER=ON
+ -DUNIT_TESTING=ON .. &&
+ make -j$(nproc) && ctest --output-on-failure
tags:
- - shared
+- shared
except:
- - tags
+- tags
artifacts:
expire_in: 1 week
when: on_failure
@@ -62,17 +71,18 @@ fedora/address-sanitizer:
- obj/
fedora/undefined-sanitizer:
+ stage: analysis
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- - mkdir -p obj && cd obj && cmake
--DCMAKE_BUILD_TYPE=UndefinedSanitizer
--DPICKY_DEVELOPER=ON
--DUNIT_TESTING=ON ..
-&& make -j$(nproc) && ctest --output-on-failure
+- mkdir -p obj && cd obj && cmake
+ -DCMAKE_BUILD_TYPE=UndefinedSanitizer
+ -DPICKY_DEVELOPER=ON
+ -DUNIT_TESTING=ON ..
+ && make -j$(nproc) && ctest --output-on-failure