From 233362036446e18424c36969a45618f0a7e67c3c Mon Sep 17 00:00:00 2001 From: Pascal Jufer Date: Fri, 2 Sep 2016 12:13:38 +0200 Subject: [PATCH 01/10] Use the xenial repo to get libwebkit2gtk-4.0-dev --- circle.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 65747d7..0ec71d6 100644 --- a/circle.yml +++ b/circle.yml @@ -9,9 +9,11 @@ dependencies: liblightdm-gobject-1-dev libexo-1-dev exo-utils - libwebkit2gtk-4.0-dev libdbus-glib-1-dev gnome-common + - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ xenial main universe" + - sudo apt-get update + - sudo apt-get install -y libwebkit2gtk-4.0-dev test: override: From 7060e7cd9682345b521973f39e98e21bf7c1ba23 Mon Sep 17 00:00:00 2001 From: Pascal Jufer Date: Fri, 2 Sep 2016 12:37:45 +0200 Subject: [PATCH 02/10] Update repositories initially --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 0ec71d6..3a00835 100644 --- a/circle.yml +++ b/circle.yml @@ -3,6 +3,7 @@ machine: dependencies: post: + - sudo apt-get update - > sudo apt-get install -y libgtk-3-0 From a03105d999ba16c43844fd81ecf24c8bd69827d3 Mon Sep 17 00:00:00 2001 From: Pascal Jufer Date: Fri, 2 Sep 2016 12:55:45 +0200 Subject: [PATCH 03/10] Prevent prompts during libwebkitgtk installation --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 3a00835..1ac0d51 100644 --- a/circle.yml +++ b/circle.yml @@ -14,7 +14,7 @@ dependencies: gnome-common - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ xenial main universe" - sudo apt-get update - - sudo apt-get install -y libwebkit2gtk-4.0-dev + - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libwebkit2gtk-4.0-dev test: override: From 3f6f1dabfd2f108810d569b374a4e68620b63c3c Mon Sep 17 00:00:00 2001 From: Pascal Jufer Date: Fri, 2 Sep 2016 15:44:18 +0200 Subject: [PATCH 04/10] Upgrade upstart to prevent lxc-common error --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 1ac0d51..367dc10 100644 --- a/circle.yml +++ b/circle.yml @@ -4,6 +4,7 @@ machine: dependencies: post: - sudo apt-get update + - sudo apt-get upgrade -y upstart - > sudo apt-get install -y libgtk-3-0 From dc41931cd38494b3220c2dce5bc8c00ef438f516 Mon Sep 17 00:00:00 2001 From: Pascal Jufer Date: Fri, 2 Sep 2016 15:49:53 +0200 Subject: [PATCH 05/10] Prevent prompts during upstart upgrade as well --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 367dc10..34eca60 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: dependencies: post: - sudo apt-get update - - sudo apt-get upgrade -y upstart + - sudo DEBIAN_FRONTEND=noninteractive apt-get upgrade -y upstart - > sudo apt-get install -y libgtk-3-0 From 3c1f08cd16fc9175cd52d22655444ee0849dcfeb Mon Sep 17 00:00:00 2001 From: Pascal Jufer Date: Fri, 2 Sep 2016 15:59:30 +0200 Subject: [PATCH 06/10] Correct command for upgrading upstart --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 34eca60..b058e12 100644 --- a/circle.yml +++ b/circle.yml @@ -4,9 +4,9 @@ machine: dependencies: post: - sudo apt-get update - - sudo DEBIAN_FRONTEND=noninteractive apt-get upgrade -y upstart - > sudo apt-get install -y + upstart libgtk-3-0 liblightdm-gobject-1-dev libexo-1-dev From 352460fd99a93463eb886bfcf2d984e5a2c0c5f4 Mon Sep 17 00:00:00 2001 From: Pascal Jufer Date: Mon, 5 Sep 2016 12:05:22 +0200 Subject: [PATCH 07/10] Revert unnecessary upstart specific changes This reverts commit 3f6f1dabfd2f108810d569b374a4e68620b63c3c. --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index b058e12..1ac0d51 100644 --- a/circle.yml +++ b/circle.yml @@ -6,7 +6,6 @@ dependencies: - sudo apt-get update - > sudo apt-get install -y - upstart libgtk-3-0 liblightdm-gobject-1-dev libexo-1-dev From f1079f8a0aee0f9a9d26df218ec71daa143c4d2b Mon Sep 17 00:00:00 2001 From: Pascal Jufer Date: Mon, 5 Sep 2016 13:03:02 +0200 Subject: [PATCH 08/10] Ignore error during installation of libwebkit2gtk During the installation of libwebkit2gtk-4.0-dev the apparmor-profile-load script called by the post installation script of lxc-common fails due to the missing systemd-detect-virt binary, which is not present in trusty but expected to be there as we are using packages from xenial. Consequently the whole installation command is considered as failed. However the installation of libwebkit2gtk-4.0-dev is actually successful, so we can ignore this error. --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 1ac0d51..74a5bc4 100644 --- a/circle.yml +++ b/circle.yml @@ -14,7 +14,7 @@ dependencies: gnome-common - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ xenial main universe" - sudo apt-get update - - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libwebkit2gtk-4.0-dev + - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libwebkit2gtk-4.0-dev || true test: override: From afcc00c43cf5f5ee9d123ed57180208975515b71 Mon Sep 17 00:00:00 2001 From: Pascal Jufer Date: Mon, 5 Sep 2016 13:22:04 +0200 Subject: [PATCH 09/10] Add comments --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index 74a5bc4..f9ff53a 100644 --- a/circle.yml +++ b/circle.yml @@ -12,8 +12,10 @@ dependencies: exo-utils libdbus-glib-1-dev gnome-common + # use the repository from xenial to get libwebkit2gtk-4.0-dev - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ xenial main universe" - sudo apt-get update + # ignore the error during the installation - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libwebkit2gtk-4.0-dev || true test: From 92ebb0888348d4fd813490bb0b7b6939cdc04c48 Mon Sep 17 00:00:00 2001 From: Pascal Jufer Date: Mon, 5 Sep 2016 13:30:03 +0200 Subject: [PATCH 10/10] test: remove "cd" and split over multiple lines It isn't necessary to change to the checkout directory because this is already the default pwd in the test section. Also split the commands over multiple line for overview purposes. --- circle.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index f9ff53a..96ef233 100644 --- a/circle.yml +++ b/circle.yml @@ -20,4 +20,6 @@ dependencies: test: override: - - cd ${CIRCLE_PROJECT_REPONAME}; ./autogen.sh && make && sudo make install + - ./autogen.sh + - make + - sudo make install