From 2f9c824a8af13bf9d4e763fc7225476a9511065c Mon Sep 17 00:00:00 2001
From: Guilherme Becker Agge <gba17@inf.ufpr.br>
Date: Wed, 25 Jul 2018 11:34:44 -0300
Subject: [PATCH 1/3] SCRUM#463: Add more testing stages on CI
---
.gitlab-ci.yml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5efd3f8..f936d70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,13 +21,14 @@ test:
- ubuntu
- regular
script:
- # TODO: find a way to get the dependencies automatically
- - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales language-pack-gnome-pt language-pack-pt-base wget
+ - apt-get update && apt-get install -y wget
+ - echo "deb http://repo.c3sl.ufpr.br/le6/ unstable main" > /etc/apt/sources.list.d/le6.list
- wget -O- http://repo.c3sl.ufpr.br/le6/le.c3sl.ufpr.br.key | apt-key add -
- - echo "deb http://repo.c3sl.ufpr.br/le6/ testing main" > /etc/apt/sources.list.d/le6.list && apt-get update
- - locale-gen pt_BR.UTF-8
- - export LANG=pt_BR.UTF-8
- - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install $(pwd)/build/*.deb
+ - echo "Installation test:"
+ - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install $(pwd)/build/*.deb language-pack-gnome-pt language-pack-pt-base
+ - echo "Removal test:"
+ - pkg_name=$(dpkg -I $(pwd)/build/*.deb | grep Package | head -1 | cut -d ':' -f2)
+ - DEBIAN_FRONTEND=noninteractive apt -y remove $pkg_name
dependencies:
- build
--
GitLab
From 481928eaf23f326347e296505dcefb6d8956fd81 Mon Sep 17 00:00:00 2001
From: Guilherme Becker Agge <gba17@inf.ufpr.br>
Date: Wed, 25 Jul 2018 14:11:31 -0300
Subject: [PATCH 2/3] SCRUM#463: Add more testing stages on CI
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f936d70..abbacf4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ test:
- echo "Installation test:"
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install $(pwd)/build/*.deb language-pack-gnome-pt language-pack-pt-base
- echo "Removal test:"
- - pkg_name=$(dpkg -I $(pwd)/build/*.deb | grep Package | head -1 | cut -d ':' -f2)
+ - pkg_name=$(head -n 1 package/debian/changelog | cut -d' ' -f1)
- DEBIAN_FRONTEND=noninteractive apt -y remove $pkg_name
dependencies:
- build
--
GitLab
From 42eee61d7be146ffd4b6075124019cda386abff9 Mon Sep 17 00:00:00 2001
From: Guilherme Becker Agge <gba17@c3sl.ufpr.br>
Date: Thu, 2 Aug 2018 09:57:19 -0300
Subject: [PATCH 3/3] Fix version to deploy
---
.deploy.sh | 26 ++++++++++++++++++--------
.gitlab-ci.yml | 12 ++++++++++++
package/debian/changelog | 6 ++++++
3 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/.deploy.sh b/.deploy.sh
index d02eac5..492c880 100755
--- a/.deploy.sh
+++ b/.deploy.sh
@@ -1,23 +1,33 @@
#!/bin/bash
+# shellcheck disable=SC2029
# This script uploads an includes a .deb package in our debian repository.
# The distribution is chosen based on the gitlab-ci stage we are on.
apt-get update && apt-get install -y dput ssh
-eval $(ssh-agent -s)
+eval "$(ssh-agent -s)"
ssh-add <(echo "$PRIV_KEY")
echo "Deploy job name: $CI_JOB_NAME"
-if [ "$CI_JOB_NAME" = "deploy_for_testing" ]; then
+if [ "$CI_JOB_NAME" = "deploy_for_unstable" ]; then
dput -u -f --config=dput.cf repo build/*.changes
-elif [ "$CI_JOB_NAME" = "deploy_for_stable" ]; then
+
+else
+ if [ "$CI_JOB_NAME" = "deploy_for_testing" ]; then
+ REPO_SRC="unstable"
+ REPO_TGT="testing"
+ elif [ "$CI_JOB_NAME" = "deploy_for_stable" ]; then
+ REPO_SRC="testing"
+ REPO_TGT="stable"
+ fi
+
CHANGELOG="package/debian/changelog"
LINE=$(head -n 1 $CHANGELOG)
- PACKAGE=$(echo $LINE | cut -d' ' -f1)
- VERSION=$(echo $LINE | cut -d' ' -f2 | grep -o -E '[0-9]*\.[0-9]*\.[0-9]*')
+ PACKAGE=$(echo "$LINE" | cut -d' ' -f1)
+ VERSION=$(echo "$LINE" | cut -d' ' -f2 | grep -o -E '[0-9]*\.[0-9]*\.[0-9]*')
+ REPREPRO_CMD="reprepro -Vb /home/repository/www/le6 copysrc $REPO_TGT $REPO_SRC $PACKAGE $VERSION"
- REPREPRO_CMD="reprepro -Vb /home/repository/www/le6 copysrc stable testing $PACKAGE $VERSION"
- ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa repository@repo.c3sl.ufpr.br "$REPREPRO_CMD"
-fi
+ ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null repository@repo.c3sl.ufpr.br "$REPREPRO_CMD"
+fi
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abbacf4..90337da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,8 +32,20 @@ test:
dependencies:
- build
+deploy_for_unstable:
+ stage: deploy
+ only:
+ - develop
+ tags:
+ - debian-packaging
+ script:
+ - ./.deploy.sh
+ dependencies:
+ - build
+
deploy_for_testing:
stage: deploy
+ when: manual
only:
- master
tags:
diff --git a/package/debian/changelog b/package/debian/changelog
index fc7332b..e32f815 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+le-parental-control (0.0.11) unstable; urgency=medium
+
+ * Updated version to internal control
+
+ -- Guilherme Becker Agge <lesuporte@c3sl.ufpr.br> Thu, 02 Aug 2018 09:56:01 -0300
+
le-parental-control (0.0.10) testing; urgency=medium
* Enable family-shield by default only on install
--
GitLab