Skip to content
Snippets Groups Projects
Commit 3cf851cf authored by Guilherme Becker Agge's avatar Guilherme Becker Agge
Browse files

Merge branch 'develop' into 'issue/463'

# Conflicts:
#   .gitlab-ci.yml
parents 4a37d0da 696fbfb6
No related branches found
No related tags found
2 merge requests!27Deploy le-parental-control:1.0.0 for testing,!20SCRUM#463: Add more testing stages on CI
Pipeline #17047 passed
......@@ -51,28 +51,6 @@ deploy_for_unstable:
dependencies:
- build
deploy_for_unstable:
stage: deploy
only:
- develop
tags:
- debian-packaging
script:
- ./.deploy.sh
dependencies:
- build
deploy_for_unstable:
stage: deploy
only:
- develop
tags:
- debian-packaging
script:
- ./.deploy.sh
dependencies:
- build
deploy_for_testing:
stage: deploy
when: manual
......
......@@ -6,5 +6,4 @@ incoming = /home/repository/www/le6/incoming
allow_unsigned_uploads = 1
ssh_config_options = User=repository
StrictHostKeyChecking=no
UserKnownHostsFile=/dev/null
post_upload_command = ssh -l repository repo.c3sl.ufpr.br "reprepro -Vb /home/repository/www/le6 processincoming default"
post_upload_command = ssh -l repository -i ~/.ssh/id_rsa repo.c3sl.ufpr.br "reprepro -Vb /home/repository/www/le6 processincoming default"
le-parental-control (0.0.10ubuntu1) unstable; urgency=medium
le-parental-control (0.0.13) unstable; urgency=medium
* Updated version to internal control
-- Guilherme Becker Agge <lesuporte@c3sl.ufpr.br> Thu, 02 Aug 2018 10:01:18 -0300
le-parental-control (0.0.12) unstable; urgency=medium
* Family shild is disable by default when installing in private mode
-- Stephanie Briere Americo <lesuporte@c3sl.ufpr.br> Wed, 25 Jul 2018 11:35:53 -0300
le-parental-control (0.0.10) unstable; urgency=medium
le-parental-control (0.0.11) unstable; urgency=medium
* Add more testing stages on CI (Closes: #463)
* Change deploy to unstable (Closes: #492)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment