[Git][noosfero/noosfero][stretch] 8 commits: stretch-update: update rmagick require
Rodrigo Souto
gitlab at mg.gitlab.com
Fri Dec 22 16:29:35 BRST 2017
Rodrigo Souto pushed to branch stretch at Noosfero / noosfero
Commits:
fcac1607 by Rodrigo Souto at 2017-12-22T15:27:25-03:00
stretch-update: update rmagick require
- - - - -
d1dd6fc1 by Rodrigo Souto at 2017-12-22T15:27:25-03:00
stretch-update: create docker ci and install-dependencies script
- - - - -
774bf9fc by Rodrigo Souto at 2017-12-22T15:27:26-03:00
stretch-update: install gnupg for apt-add key
- - - - -
510d75a6 by Rodrigo Souto at 2017-12-22T15:27:26-03:00
stretch-update: install apt-transport-https to handle ssl
- - - - -
2fe86c8c by Rodrigo Souto at 2017-12-22T15:27:26-03:00
stretch-update: configure gitlab-ci to use stretch docker
- - - - -
22927b28 by Rodrigo Souto at 2017-12-22T15:27:26-03:00
stretch-update: fix broken tests
- - - - -
6c5c274d by Rodrigo Souto at 2017-12-22T15:27:26-03:00
stretch-update: configure ci to use only stretch runner
- - - - -
d9e78708 by Rodrigo Souto at 2017-12-22T15:27:26-03:00
stretch-update: update repository signing key
- - - - -
7 changed files:
- .gitlab-ci.yml
- app/models/concerns/string_template.rb
- + config/docker/ci-stretch/Dockerfile
- + config/docker/ci-stretch/build
- plugins/html5_video/lib/video_processor/ffmpeg.rb
- plugins/theme_manager/test/unit/theme_manager_helper_test.rb
- + script/install-dependencies/debian-stretch.sh
Changes:
=====================================
.gitlab-ci.yml
=====================================
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: noosfero/ci
+image: noosfero/ci-stretch
before_script:
- mkdir -p locale # makes quick-start skip compiling translations
@@ -20,7 +20,7 @@ stages:
.tags-template: &tags
tags:
- - jessie
+ - stretch
specs-models:
<<: *retriable
=====================================
app/models/concerns/string_template.rb
=====================================
--- a/app/models/concerns/string_template.rb
+++ b/app/models/concerns/string_template.rb
@@ -9,7 +9,7 @@ module StringTemplate
def to_html(options = {})
article, content = self, super
if content.is_a? Proc
- -> context { article.parse_string_params(article, self.instance_exec(&content)) }
+ -> context { article.parse_string_params(article, self.instance_eval(&content)) }
else
parse_string_params(article, content)
end
=====================================
config/docker/ci-stretch/Dockerfile
=====================================
--- /dev/null
+++ b/config/docker/ci-stretch/Dockerfile
@@ -0,0 +1,5 @@
+FROM debian:stretch
+MAINTAINER Noosfero Development Team <noosfero-dev at listas.softwarelivre.org>
+
+COPY ./build /srv/build
+RUN /srv/build
=====================================
config/docker/ci-stretch/build
=====================================
--- /dev/null
+++ b/config/docker/ci-stretch/build
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -ex
+
+# system-wide setup
+echo 'LANG=C.UTF-8' > /etc/default/locale
+
+# get code
+apt-get update
+apt-get install -y sudo git
+git clone --depth 1 https://gitlab.com/noosfero/noosfero.git /var/tmp/noosfero
+
+# install everything
+cd /var/tmp/noosfero
+
+#TODO Remove after merged to master
+git fetch origin stretch:stretch
+git checkout stretch
+
+./script/set-apt-proxy
+mkdir -p locale
+./script/quick-start
+
+# cleanup
+cd /
+rm -rf /var/tmp/noosfero
+apt-get clean
+rm -f /etc/apt/apt.conf.d/01proxy
+rm -rf /var/lib/apt/lists/*
=====================================
plugins/html5_video/lib/video_processor/ffmpeg.rb
=====================================
--- a/plugins/html5_video/lib/video_processor/ffmpeg.rb
+++ b/plugins/html5_video/lib/video_processor/ffmpeg.rb
@@ -1,4 +1,4 @@
-require 'RMagick'
+require 'rmagick'
# Works for ffmpeg version 2.8.6-1~bpo8 shiped by Debian Jessie Backports
# https://packages.debian.org/jessie-backports/ffmpeg
=====================================
plugins/theme_manager/test/unit/theme_manager_helper_test.rb
=====================================
--- a/plugins/theme_manager/test/unit/theme_manager_helper_test.rb
+++ b/plugins/theme_manager/test/unit/theme_manager_helper_test.rb
@@ -27,7 +27,7 @@ class ThemeManagerHelperPluginTest < ActiveSupport::TestCase
assert_equal result[:file_type], 'text/plain'
pack.stubs(:read).returns 'PKJteste/PK'
result = get_theme_package @temp, pack
- assert_equal result[:file_type], 'application/zip'
+ assert_equal result[:file_type], 'application/octet-stream'
end
should "exists zipfile reference" do
=====================================
script/install-dependencies/debian-stretch.sh
=====================================
--- /dev/null
+++ b/script/install-dependencies/debian-stretch.sh
@@ -0,0 +1,88 @@
+binary_packages='deb https://download.noosfero.org/debian/stretch ./'
+
+source_packages=$(echo "$binary_packages" | sed -e 's/^deb/deb-src/')
+
+if ! grep -q "$binary_packages" /etc/apt/sources.list.d/noosfero.list; then
+ sudo tee /etc/apt/sources.list.d/noosfero.list <<EOF
+$binary_packages
+$source_packages
+EOF
+
+sudo apt-get -fy install gnupg apt-transport-https
+
+ sudo apt-key add - <<EOF
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFo9LwwBCACthrtkJxzKTfG1zL32IWDqemvdWwnfgLFBkZ7yr4lKy5dDIK1m
+a8BpNjR/+nGOO3ujLvEc7eLGURoZRPH/+Z5ZfKtgrD5NWS7Kt5e8iTQoHcGcW1Sv
+c6C+gU2DPOPjo/+N0MsIIJN6R7gTTY2tOH3ruPm0mmCRDZUIDH77Fz9XRnmZI0b+
+lnH43HJR3jQSVMWOX6d3HQGTPfxgNebO3LniaRVA/cjaYPRYWzUlxxiJreTQlNTv
+9c1rlQeRwu97MCS+UyAFRpwmBWHVp7W77jAH9o6ODntxRW67lJuGEFQJlgiCOJnZ
+eeqObIxIFzWVG1mpc2yIRb55H5kP9RLG5dZZABEBAAG0RE5vb3NmZXJvIEFyY2hp
+dmUgU2lnbmluZyBLZXkgPG5vb3NmZXJvLWRldkBsaXN0YXMuc29mdHdhcmVsaXZy
+ZS5vcmc+iQFUBBMBCgA+FiEEJpI+nK5tSlqLUb7sAeYc3X1ajTcFAlo9LwwCGwMF
+CQPCZwAFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQAeYc3X1ajTe22Qf/ejSY
+t452tX5d3/RtJnd4pNJhZNvt4cyNUkGkLAjJpgagsUqj7m17Tqc1rrrh6rb8/PXl
+yZgSgcLG8XOOkkF5UgNujBXd4gLBnKb5UAem396fDmOBNdSr9lzbHyOwt43cYOFx
+EEqqjcCr7kAOFGCfFOlBbCQ7yBJoix4iWelRxfDbzD/tiPYtDj/jPsg9+bFNU4Co
+vidjjo79cyB19QyGv7UQAu1WY1CwzXYcoEYFrOiewQYmYdpzJaq26m04brVfBSW1
+nEQHbVWGsUqUDmmqGHptd2auEI7WXP3JTkKhVbPmb85MMWuFe5Mz1YHMjwWXylyL
+aSzN+MrXK0LmR2qnarkBDQRaPS8MAQgAxmCCLISCBb01CK3Nnz8HK6ccNPxn7y5I
+beMjQec0ODdEAO7Xy3XWu8QW7Jq5GltxYuSJZh70SNM/G83qmPTZmw8NhxITLWly
+CboobizSc8mD6R1mSDhd23Dnu8aejvqkE6Qr66hlTBqq3D7o2to2/Q5gOSIH3lP5
+UZ24+FY1MmJ7vsSW+/AofgoKU8D7g9CbzOI/UOZqD12+xqDfY2B8nzE1NW8dKemv
+76ejKP5nBgYPmHeQDb5Sqx8yZ2RbssNgPKTtp5t5BVFHpS7ZG+2qLUEgHx4kZilQ
+5jYL9Bf6UoSJ/f0SgtT8SjeJn1oZC9C381FwcYgGdZyu+n4cWyuJfQARAQABiQE8
+BBgBCgAmFiEEJpI+nK5tSlqLUb7sAeYc3X1ajTcFAlo9LwwCGwwFCQPCZwAACgkQ
+AeYc3X1ajTdnwAf9GxIHcn0RS8PyJ3K4pxnko2tJ4gvt3PHVS3wLAlSI6vp3JQeR
+PlR50LeG/3YFHSef48Kk8ZM/iVD5fpnnpaFk+j+ytLzTis6rneskufEZbCUyO055
+UesXD1Oms06vc2QgFuqhTXR3ZvqN2yhdHSqCmc+sdQi612BH6b+RufTUFRd5U52b
+lUjtdCHZ5vXPcQ67cGade8BU7DJY8abRb6r5lD8jvROxWL5k/iRlMwwgiRXC5Frd
+CdUuv9egEIjH82viVMIjV67mxx0ifpRgIZsbktJvgElOqEzA8xxydU2NHUoVc6jb
++OB5skBulpAs0tokuToakNlMeZFA/mhEHjoiAA==
+=JjJa
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+fi
+
+
+if test -f tmp/debian/Release.gpg; then
+ echo "deb file://$(pwd)/tmp/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list
+ sudo apt-key add tmp/debian/signing-key.asc
+else
+ sudo rm -f /etc/apt/sources.list.d/local.list
+fi
+
+retry() {
+ local times="$1"
+ shift
+ local i=0
+ local rc=0
+ while [ $i -lt "$times" ]; do
+ echo '$' "$@"
+ "$@" && rc=0 || rc=$?
+ i=$(($i + 1))
+ if [ $rc -eq 0 ]; then return 0; fi
+ done
+ return $rc
+}
+
+# update system, at most every 6h (internal between Debian mirror pushes)
+timestamp=/tmp/.noosfero.apt-get.update
+now=$(date +%s)
+if [ ! -f $timestamp ] || [ $(($now - $(stat --format=%Y $timestamp))) -gt 21600 ]; then
+ run retry 3 sudo apt-get update
+ run retry 3 sudo apt-get -qy dist-upgrade
+ touch $timestamp
+fi
+
+run sudo apt-get -y install dctrl-tools
+
+# needed to run noosfero
+packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debian/control | sed -e '/^\s*#/d; s/([^)]*)//g; s/,\s*/\n/g' | grep -v 'memcached\|debconf\|dbconfig-common\|misc:Depends\|adduser\|mail-transport-agent')
+run sudo apt-get -y --allow-unauthenticated install $packages
+sudo apt-get -y install iceweasel || sudo apt-get -y install firefox
+
+run rm -f Gemfile.lock
+run bundle --local
+
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/2815ec4c8c79c9717c59d617616d784eec25a282...d9e78708235062a05e9f008121403991c39e6d05
---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/2815ec4c8c79c9717c59d617616d784eec25a282...d9e78708235062a05e9f008121403991c39e6d05
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20171222/0956cc0c/attachment-0001.html>
More information about the Noosfero-dev
mailing list