From 86987f9e69de94edeae7107c8e4aa6460d8ddf8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Thu, 5 Mar 2020 11:36:23 +0100 Subject: [PATCH 1/2] Upgade camshaft to version 0.65.3 --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index e57ae602a..2bb0dca19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -197,7 +197,7 @@ "resolved": "https://registry.npmjs.org/@carto/mapnik/-/mapnik-3.6.2-carto.16.tgz", "integrity": "sha512-RX8ov5EpEheToESVKiKnV5yMPLA2KxaX2ANAs9W4856oKFPdbGmB2buDz54mLhwBDfler9GVo0Bzr2ayRVLO2A==", "requires": { - "mapnik-vector-tile": "github:cartodb/mapnik-vector-tile#e7ca5471f9e5de81243e6035e70444321fc0a82f", + "mapnik-vector-tile": "github:cartodb/mapnik-vector-tile#v1.6.1-carto.2", "nan": "2.14.0", "node-pre-gyp": "0.13.0" } @@ -766,9 +766,9 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "camshaft": { - "version": "0.65.2", - "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.65.2.tgz", - "integrity": "sha512-w/5FVblFzXGTSjZi/sUom++u0oePor4McJKnIvUul8tvTcHTZFxoXpoClEoDRCwX/KFGtXbE6ORY10gcGz/aAA==", + "version": "0.65.3", + "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.65.3.tgz", + "integrity": "sha512-URr3gWV1QtUATYXQzCTTc7Z1sjlc4ZDTdm+qsOhrOll5ieU1BXkO8puIe8Ts7pwMHH2cLgEy1Ddh+a/V8QMt7A==", "requires": { "async": "^1.5.2", "bunyan": "1.8.1", @@ -869,7 +869,7 @@ "integrity": "sha512-myLV2xo3q9oTT8m8M+c+UTD/ziDN7hrYtZ9yY00KvMnu2NsVeRQsTe8Yxq1GVS8vF9iYfcelwjVEGObPUdLtHw==", "requires": { "debug": "^3.1.0", - "pg": "github:cartodb/node-postgres#5417d7b29b7272ca2e71bb396899ab3f177a9ae6", + "pg": "github:cartodb/node-postgres#6.4.2-cdb2", "underscore": "~1.6.0" } }, @@ -3330,7 +3330,7 @@ "carto": "0.16.3", "debug": "~3.1.0", "generic-pool": "~2.2.0", - "millstone": "github:cartodb/millstone#eeeb308fba4586343bb848fbf8ae0d180192627d", + "millstone": "github:cartodb/millstone#v0.6.17-carto.3", "postcss": "~5.2.8", "postcss-scss": "0.4.0", "postcss-strip-inline-comments": "0.1.5", @@ -6392,7 +6392,7 @@ "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-3.1.1.tgz", "integrity": "sha512-kfIrmI7TGqJT/J9DH8Mgvd9VEwcvAtnvyYyqymSN6WZ5L4BaVQEQ+zu5FgLChNAqCaRkqGc7bKp0Hj9A0rempA==", "requires": { - "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", + "carto": "github:cartodb/carto#master", "d3": "3.5.17", "turbo-carto": "^0.21.1", "turf-jenks": "~1.0.1" @@ -6601,7 +6601,7 @@ "@carto/cartonik": "^0.7.0", "@carto/mapnik": "3.6.2-carto.16", "canvas": "^2.4.1", - "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", + "carto": "github:cartodb/carto#0.15.1-cdb5", "cartodb-psql": "^0.14.0", "cartodb-query-tables": "^0.6.1", "debug": "3.1.0", diff --git a/package.json b/package.json index add3e29fb..1a369e409 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@google-cloud/pubsub": "1.5.0", "basic-auth": "2.0.0", "body-parser": "1.18.3", - "camshaft": "^0.65.2", + "camshaft": "^0.65.3", "cartodb-psql": "0.14.0", "cartodb-query-tables": "^0.7.0", "cartodb-redis": "2.1.0", From 8c42ac90530796385b1eb6d26ad1d8438840a0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Thu, 5 Mar 2020 11:40:41 +0100 Subject: [PATCH 2/2] Update NEWS and project version --- NEWS.md | 8 ++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 86de5b1fe..a0a2495e9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,13 @@ # Changelog +## 8.1.2 +Released 2020-mm-dd + +Announcements: +- Upgrade camshaft to [`0.65.3`](https://github.com/CartoDB/camshaft/blob/0.65.3/CHANGELOG.md#0653): + - Fix noisy message logs while checking analyses' limits. + - Fix CI setup, explicit use of PGPORT while creating the PostgreSQL cluster. + ## 8.1.1 Released 2020-02-17 diff --git a/package-lock.json b/package-lock.json index 2bb0dca19..9114f31c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "8.1.1", + "version": "8.1.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1a369e409..2cb6087d5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "8.1.1", + "version": "8.1.2", "description": "CARTO Maps API tiler", "keywords": [ "carto",