Commit b5b38410 authored by Diego Giovane Pasqualin's avatar Diego Giovane Pasqualin
Browse files

Merge branch 'develop' into 'master'

Issue SCRUM#202: Add image to build i386 package

See merge request !10
parents b0efd1e8 634bee41
Pipeline #12581 passed with stages
in 32 minutes and 51 seconds
...@@ -20,6 +20,23 @@ build: ...@@ -20,6 +20,23 @@ build:
- apt-get update && apt-get install -y build-essential devscripts dh-make dh-systemd quilt adwaita-icon-theme apt autopoint bf-utf-source check dctrl-tools debconf debconf-utils debhelper devio dh-autoreconf dh-di dh-systemd dpkg-dev gir1.2-soup-2.4 gir1.2-timezonemap-1.0 gir1.2-webkit2-4.0 gir1.2-xkl-1.0 gobject-introspection imagemagick intltool intltool-debian iso-codes isoquery keymapper libbogl-dev libcairo2-dev libdebconfclient0-dev libdebian-installer4-dev libgirepository1.0-dev libglib2.0-dev libgtk-3-dev libido3-0.1-dev libindicator3-dev libiw-dev liblocale-gettext-perl libparted-dev librsvg2-bin libsubunit-dev locales pep8 pkg-config po-debconf pyflakes3 python-gi-dev python-scour python3-all python3-apt python3-cairo python3-dbus python3-gi python3-gi-cairo python3-icu python3-mock python3-pam tzdata ubuntu-artwork udev wget xkb-data xkb-data-i18n xvfb - apt-get update && apt-get install -y build-essential devscripts dh-make dh-systemd quilt adwaita-icon-theme apt autopoint bf-utf-source check dctrl-tools debconf debconf-utils debhelper devio dh-autoreconf dh-di dh-systemd dpkg-dev gir1.2-soup-2.4 gir1.2-timezonemap-1.0 gir1.2-webkit2-4.0 gir1.2-xkl-1.0 gobject-introspection imagemagick intltool intltool-debian iso-codes isoquery keymapper libbogl-dev libcairo2-dev libdebconfclient0-dev libdebian-installer4-dev libgirepository1.0-dev libglib2.0-dev libgtk-3-dev libido3-0.1-dev libindicator3-dev libiw-dev liblocale-gettext-perl libparted-dev librsvg2-bin libsubunit-dev locales pep8 pkg-config po-debconf pyflakes3 python-gi-dev python-scour python3-all python3-apt python3-cairo python3-dbus python3-gi python3-gi-cairo python3-icu python3-mock python3-pam tzdata ubuntu-artwork udev wget xkb-data xkb-data-i18n xvfb
- ./.build.sh - ./.build.sh
buildi386:
stage: build
image: i386/ubuntu:16.04
artifacts:
paths:
- build/
tags:
- ubuntu
- regular
script:
- if [ ! -d "package/debian/" ] ; then exit 1; fi
# TODO: find a way to get the dependencies automatically
# - apt-get update && apt-get --allow-downgrades --allow-remove-essential --allow-change-held-packages install -y libc6=2.23-0ubuntu9 libc-bin=2.23-0ubuntu9
- apt-get update && apt-get install -y build-essential devscripts dh-make dh-systemd quilt adwaita-icon-theme apt autopoint bf-utf-source check dctrl-tools debconf debconf-utils debhelper devio dh-autoreconf dh-di dh-systemd dpkg-dev gir1.2-soup-2.4 gir1.2-timezonemap-1.0 gir1.2-webkit2-4.0 gir1.2-xkl-1.0 gobject-introspection imagemagick intltool intltool-debian iso-codes isoquery keymapper libbogl-dev libcairo2-dev libdebconfclient0-dev libdebian-installer4-dev libgirepository1.0-dev libglib2.0-dev libgtk-3-dev libido3-0.1-dev libindicator3-dev libiw-dev liblocale-gettext-perl libparted-dev librsvg2-bin libsubunit-dev locales pep8 pkg-config po-debconf pyflakes3 python-gi-dev python-scour python3-all python3-apt python3-cairo python3-dbus python3-gi python3-gi-cairo python3-icu python3-mock python3-pam tzdata ubuntu-artwork udev wget xkb-data xkb-data-i18n xvfb
- ./.build.sh
test: test:
stage: test stage: test
tags: tags:
...@@ -31,6 +48,41 @@ test: ...@@ -31,6 +48,41 @@ test:
dependencies: dependencies:
- build - build
testi386:
stage: test
image: i386/ubuntu:16.04
tags:
- ubuntu
- regular
script:
# TODO: find a way to get the dependencies automatically
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install $(pwd)/build/*.deb
dependencies:
- buildi386
deploy_for_testingi386:
stage: deploy
only:
- master
tags:
- debian-packaging
script:
- ./.deploy.sh
dependencies:
- buildi386
deploy_for_stablei386:
stage: deploy
when: manual
only:
- master
tags:
- debian-packaging
script:
- ./.deploy.sh
dependencies:
- buildi386
deploy_for_testing: deploy_for_testing:
stage: deploy stage: deploy
only: only:
......
ubiquity (2.21.63.7) testing; urgency=medium
* Force timezone to America/Sao_Paulo when user chooses a pt_BR installation.
-- Daniel Bissani Furlin <dbf15@c3sl.ufpr.br> Mon, 25 Sep 2017 13:38:41 -0300
ubiquity (2.21.63.6) testing; urgency=medium ubiquity (2.21.63.6) testing; urgency=medium
   
* Remove unused packages. * Remove unused packages.
......
...@@ -471,6 +471,8 @@ class Page(plugin.Plugin): ...@@ -471,6 +471,8 @@ class Page(plugin.Plugin):
choices_c = self.choices_untranslated(question) choices_c = self.choices_untranslated(question)
if choices_c: if choices_c:
zone = choices_c[0] zone = choices_c[0]
if 'America/Rio_Branco' in zone:
zone = 'America/Sao_Paulo'
self.ui.set_timezone(zone) self.ui.set_timezone(zone)
if self.automatic_page: if self.automatic_page:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment