[libhandy/wip/exalm/ci] ci: Remove global before_script and move api-visibility to default image
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libhandy/wip/exalm/ci] ci: Remove global before_script and move api-visibility to default image
- Date: Fri, 22 May 2020 11:10:56 +0000 (UTC)
commit 98c11c814e57102da190dca196bc92c9f40a646a
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Fri May 22 16:01:31 2020 +0500
ci: Remove global before_script and move api-visibility to default image
.gitlab-ci.yml | 18 ++++++++++++------
lint/api-visibility.sh | 4 ++--
2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30790404..dde498af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,11 +8,6 @@ stages:
- test-package
- deploy
-before_script:
- - apt-get -y update
- - apt-get -y install build-essential libgtk-3-doc libgdk-pixbuf2.0-doc lcov
- - apt-get -y build-dep .
-
.build: &build_steps
echo "BUILD_OPTS=${BUILD_OPTS}" &&
export LC_ALL=C.UTF-8 &&
@@ -20,7 +15,6 @@ before_script:
ninja -C _build
api-visibility:
- image: debian:buster
stage: build
script:
- lint/api-visibility.sh
@@ -28,6 +22,10 @@ api-visibility:
build-debian-gcc:
image: debian:buster
stage: build
+ before_script:
+ - apt-get -y update
+ - apt-get -y install build-essential libgtk-3-doc libgdk-pixbuf2.0-doc lcov
+ - apt-get -y build-dep .
variables:
BUILD_OPTS: -Dgtk_doc=true -Db_coverage=true --werror
script:
@@ -71,6 +69,10 @@ build-fedora-gcc:
build-gtkdoc:
image: debian:buster
stage: test+docs
+ before_script:
+ - apt-get -y update
+ - apt-get -y install build-essential libgtk-3-doc libgdk-pixbuf2.0-doc lcov
+ - apt-get -y build-dep .
dependencies:
- build-debian-gcc
script:
@@ -84,6 +86,10 @@ build-gtkdoc:
unit-test:
image: debian:buster
stage: test+docs
+ before_script:
+ - apt-get -y update
+ - apt-get -y install build-essential libgtk-3-doc libgdk-pixbuf2.0-doc lcov
+ - apt-get -y build-dep .
dependencies:
- build-debian-gcc
script:
diff --git a/lint/api-visibility.sh b/lint/api-visibility.sh
index 077757a6..ce8e7f58 100755
--- a/lint/api-visibility.sh
+++ b/lint/api-visibility.sh
@@ -1,14 +1,14 @@
#!/bin/bash
# Check that private headers aren't included in public ones.
-if grep "include.*private.h" $(find src -name '*\.h' -not -regex '.*private.h');
+if grep "include.*private.h" $(ls src/*.h | grep -v "private.h");
then
echo "Private headers shouldn't be included in public ones."
exit 1
fi
# Check that handy.h contains all the public headers.
-for header in $(find src -name '*.h' -not -regex '.*private.h' -not -regex '.*/handy.h');
+for header in $(ls src | grep "\.h$" | grep -v "private.h" | grep -v handy.h);
do
if ! grep -q "$(basename $header)" src/handy.h;
then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]