From ea2fda00196cfe7544c98dea2a4bba5cb379e43e Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Thu, 23 Nov 2017 15:56:10 +0100 Subject: [PATCH 01/11] Build the application during Travis CI builds. --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..2949d836f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +language: php + +php: + - 5.6 + - 7.1 + - 7.2 + - nightly + +matrix: + fast_finish: true + allow_failures: + - php: nightly + +before_install: + # Build the application. + - ./build.sd new From 204785db694a40828c57a35641f3ddd1fb07b299 Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Thu, 23 Nov 2017 15:59:30 +0100 Subject: [PATCH 02/11] Fix an incorrect build file path. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2949d836f..17e2e3ffa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,4 +13,4 @@ matrix: before_install: # Build the application. - - ./build.sd new + - ./build.sh new From dcdc390287b1e7847c5ea20401d62a0e3925e7e5 Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Thu, 23 Nov 2017 16:05:38 +0100 Subject: [PATCH 03/11] Install Drush During Travis CI builds. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 17e2e3ffa..ab4305471 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,5 +12,8 @@ matrix: - php: nightly before_install: + # Install Drush. + - composer global require drush/drush:~8.1.5 + # Build the application. - ./build.sh new From 464df5ebe7bdd6e863c410f496aff820ad4bace4 Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Thu, 23 Nov 2017 16:10:04 +0100 Subject: [PATCH 04/11] Confirm Drush is installed during Travis CI builds. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ab4305471..b80838039 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ matrix: before_install: # Install Drush. - composer global require drush/drush:~8.1.5 + # DEBUG: Confirm Drush is installed. + - drush version # Build the application. - ./build.sh new From 243e0eb914ff125bc2730eff2843e730ba0cbacd Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Thu, 23 Nov 2017 16:11:20 +0100 Subject: [PATCH 05/11] Improve Composer set-up during Travis CI builds. --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index b80838039..9bc941a34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,13 @@ matrix: allow_failures: - php: nightly +cache: + directories: + - $HOME/.composer/cache + before_install: + - composer self-update + # Install Drush. - composer global require drush/drush:~8.1.5 # DEBUG: Confirm Drush is installed. From 0a6eba6f28574edef22d9c75108dbac32b7bcfc6 Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Thu, 23 Nov 2017 16:21:34 +0100 Subject: [PATCH 06/11] Fix Composer set-up during Travis CI builds. --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9bc941a34..ba0206f60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,12 +16,8 @@ cache: - $HOME/.composer/cache before_install: - - composer self-update + - export PATH="$HOME/.composer/vendor/bin:$PATH" - # Install Drush. - composer global require drush/drush:~8.1.5 - # DEBUG: Confirm Drush is installed. - - drush version - # Build the application. - ./build.sh new From 6d356fa1d437fc19cb94f57f7dfedd6451120811 Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Thu, 23 Nov 2017 16:32:44 +0100 Subject: [PATCH 07/11] Fix the OpenLayers release URL. --- conf/kadaproject.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/kadaproject.make b/conf/kadaproject.make index fe61c12f3..30ef3b8ef 100644 --- a/conf/kadaproject.make +++ b/conf/kadaproject.make @@ -80,7 +80,7 @@ libraries[colorbox][download][url] = https://github.com/jackmoore/colorbox/archi ; Openlayers library libraries[openlayers][download][type] = get -libraries[openlayers][download][url] = https://github.com/openlayers/openlayers/releases/download/release-2.13.1/OpenLayers-2.13.1.zip +libraries[openlayers][download][url] = https://github.com/openlayers/openlayers/archive/release-2.13.1.zip ; Contrib modules ; ------------ From 0cf20eb0c9a0010e5bcfe2fb4379e0b476473093 Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Thu, 23 Nov 2017 16:47:40 +0100 Subject: [PATCH 08/11] Ensure the files directory exists. --- build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sh b/build.sh index 86e1e9d53..3ba9161a9 100755 --- a/build.sh +++ b/build.sh @@ -433,6 +433,9 @@ class Maker: # Ensure directories exist def _precheck(self): + # Most of the time a files directory will already exist, but primarily for initial builds, it won't. + os.mkdir('files') + # Remove old build it if exists if os.path.isdir(self.temp_build_dir): shutil.rmtree(self.temp_build_dir) From 8895fc0f61a463428325e7da2f28e0b894a13850 Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Thu, 23 Nov 2017 17:07:20 +0100 Subject: [PATCH 09/11] Prevent Travis CI from running PHPUnit. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index ba0206f60..21397c07d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,3 +21,6 @@ before_install: - composer global require drush/drush:~8.1.5 - ./build.sh new + +script: + - echo "There are no tests yet, but the build passed." From d250998f17d9199569f19f235a5aedf14a0fb83a Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Thu, 23 Nov 2017 17:38:37 +0100 Subject: [PATCH 10/11] Do not try to recreate the files directory. --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 3ba9161a9..2d8ff5f46 100755 --- a/build.sh +++ b/build.sh @@ -434,7 +434,8 @@ class Maker: # Ensure directories exist def _precheck(self): # Most of the time a files directory will already exist, but primarily for initial builds, it won't. - os.mkdir('files') + if not os.path.isdir('files'): + os.mkdir('files') # Remove old build it if exists if os.path.isdir(self.temp_build_dir): From f83c7d0e23f6cd794b42fc6485072270b6cb16d6 Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Fri, 24 Nov 2017 08:49:31 +0100 Subject: [PATCH 11/11] Fix an outdated OpenLayers URL so its new repository is used. --- conf/kadaproject.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/kadaproject.make b/conf/kadaproject.make index 30ef3b8ef..9585e4343 100644 --- a/conf/kadaproject.make +++ b/conf/kadaproject.make @@ -80,7 +80,7 @@ libraries[colorbox][download][url] = https://github.com/jackmoore/colorbox/archi ; Openlayers library libraries[openlayers][download][type] = get -libraries[openlayers][download][url] = https://github.com/openlayers/openlayers/archive/release-2.13.1.zip +libraries[openlayers][download][url] = https://github.com/openlayers/ol2/archive/release-2.13.1.zip ; Contrib modules ; ------------