Merge branch 'release/v0.8.0'

Author: sonicdoe

.travis.yml

@@ -2,18 +2,19 @@ language: generic
 services:
  - docker
 env:
+ - ENVIRONMENT=ubuntu-18.04-node-v12
  - ENVIRONMENT=ubuntu-18.04-node-v10
  - ENVIRONMENT=ubuntu-18.04-node-v8
  - ENVIRONMENT=ubuntu-18.04-node-v6
+ - ENVIRONMENT=ubuntu-16.04-node-v12
  - ENVIRONMENT=ubuntu-16.04-node-v10
  - ENVIRONMENT=ubuntu-16.04-node-v8
  - ENVIRONMENT=ubuntu-16.04-node-v6
- - ENVIRONMENT=ubuntu-14.04-node-v10
- - ENVIRONMENT=ubuntu-14.04-node-v8
- - ENVIRONMENT=ubuntu-14.04-node-v6
+ - ENVIRONMENT=debian-9-node-v12
  - ENVIRONMENT=debian-9-node-v10
  - ENVIRONMENT=debian-9-node-v8
  - ENVIRONMENT=debian-9-node-v6
+ - ENVIRONMENT=debian-8-node-v12
  - ENVIRONMENT=debian-8-node-v10
  - ENVIRONMENT=debian-8-node-v8
  - ENVIRONMENT=debian-8-node-v6

CHANGELOG.md

@@ -2,13 +2,17 @@
 
 All releases and their notable changes are documented in this file. This project follows [Semantic Versioning 2](https://semver.org).
 
+## v0.8.0 (2019-07-01)
+
+- Add support for Node.js v12
+- Drop support for Ubuntu 14.04
+
 ## v0.7.0 (2018-11-06)
 
 - Update to ICU 61.1
 - Fix segmentation fault if no charset matches (it now returns `null` in that case) ([`992a110`](https://github.com/sonicdoe/detect-character-encoding/commit/992a11007fff6cfd40b952150ab8d30410c4a20a))
 - Add support for macOS Mojave
 - Add support for Debian 9
-- Drop support for macOS Sierra
 - Drop support for Alpine Linux
 
 ## v0.6.0 (2018-06-14)

LICENSE.md

@@ -2,7 +2,7 @@
 
 **BSD 2-Clause License**
 
-Copyright © 2015, 2017–2018, Jakob Krigovsky<br>
+Copyright © 2015, 2017–2019, Jakob Krigovsky<br>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README.md

@@ -32,7 +32,7 @@ detect-character-encoding may return `null` if no charset matches.
 ## Supported operating systems
 
 - macOS Mojave and macOS High Sierra
-- Ubuntu 18.04, 16.04, and 14.04
+- Ubuntu 18.04 and 16.04
 - Debian 9 and 8
 
 detect-character-encoding does not support 32-bit operating systems.

docker-compose.yml

@@ -1,5 +1,9 @@
 version: '3'
 services:
+ ubuntu-18.04-node-v12:
+ build:
+ context: .
+ dockerfile: docker/ubuntu-18.04/node-v12/Dockerfile
  ubuntu-18.04-node-v10:
  build:
  context: .
@@ -12,6 +16,10 @@ services:
  build:
  context: .
  dockerfile: docker/ubuntu-18.04/node-v6/Dockerfile
+ ubuntu-16.04-node-v12:
+ build:
+ context: .
+ dockerfile: docker/ubuntu-16.04/node-v12/Dockerfile
  ubuntu-16.04-node-v10:
  build:
  context: .
@@ -24,18 +32,10 @@ services:
  build:
  context: .
  dockerfile: docker/ubuntu-16.04/node-v6/Dockerfile
- ubuntu-14.04-node-v10:
- build:
- context: .
- dockerfile: docker/ubuntu-14.04/node-v10/Dockerfile
- ubuntu-14.04-node-v8:
- build:
- context: .
- dockerfile: docker/ubuntu-14.04/node-v8/Dockerfile
- ubuntu-14.04-node-v6:
+ debian-9-node-v12:
  build:
  context: .
- dockerfile: docker/ubuntu-14.04/node-v6/Dockerfile
+ dockerfile: docker/debian-9/node-v12/Dockerfile
  debian-9-node-v10:
  build:
  context: .
@@ -48,6 +48,10 @@ services:
  build:
  context: .
  dockerfile: docker/debian-9/node-v6/Dockerfile
+ debian-8-node-v12:
+ build:
+ context: .
+ dockerfile: docker/debian-8/node-v12/Dockerfile
  debian-8-node-v10:
  build:
  context: .

docker/debian-8/node-v12/Dockerfile

@@ -0,0 +1,12 @@
+FROM node:10-jessie
+
+RUN npm install --global node-gyp && npm cache clean --force
+
+WORKDIR /usr/src/app
+
+COPY package.json package-lock.json ./
+RUN npm install && npm cache clean --force
+COPY . .
+RUN node-gyp rebuild
+
+CMD ["npm", "test"]

docker/debian-9/node-v12/Dockerfile

@@ -0,0 +1,12 @@
+FROM node:10-stretch
+
+RUN npm install --global node-gyp && npm cache clean --force
+
+WORKDIR /usr/src/app
+
+COPY package.json package-lock.json ./
+RUN npm install && npm cache clean --force
+COPY . .
+RUN node-gyp rebuild
+
+CMD ["npm", "test"]

docker/generate.js

@@ -7,18 +7,19 @@ const yaml = require('js-yaml');
 
 /* eslint-disable key-spacing */
 const environments = [
+{os: 'ubuntu', osVersion: '18.04', nodeVersion: '12'},
 {os: 'ubuntu', osVersion: '18.04', nodeVersion: '10'},
 {os: 'ubuntu', osVersion: '18.04', nodeVersion: '8'},
 {os: 'ubuntu', osVersion: '18.04', nodeVersion: '6'},
+{os: 'ubuntu', osVersion: '16.04', nodeVersion: '12'},
 {os: 'ubuntu', osVersion: '16.04', nodeVersion: '10'},
 {os: 'ubuntu', osVersion: '16.04', nodeVersion: '8'},
 {os: 'ubuntu', osVersion: '16.04', nodeVersion: '6'},
-{os: 'ubuntu', osVersion: '14.04', nodeVersion: '10'},
-{os: 'ubuntu', osVersion: '14.04', nodeVersion: '8'},
-{os: 'ubuntu', osVersion: '14.04', nodeVersion: '6'},
+{os: 'debian', osVersion: '9', nodeVersion: '12', dockerTag: '10-stretch'},
 {os: 'debian', osVersion: '9', nodeVersion: '10', dockerTag: '10-stretch'},
 {os: 'debian', osVersion: '9', nodeVersion: '8', dockerTag: '8-stretch'},
 {os: 'debian', osVersion: '9', nodeVersion: '6', dockerTag: '6-stretch'},
+{os: 'debian', osVersion: '8', nodeVersion: '12', dockerTag: '10-jessie'},
 {os: 'debian', osVersion: '8', nodeVersion: '10', dockerTag: '10-jessie'},
 {os: 'debian', osVersion: '8', nodeVersion: '8', dockerTag: '8-jessie'},
 {os: 'debian', osVersion: '8', nodeVersion: '6', dockerTag: '6-jessie'}

docker/ubuntu-14.04/node-v8/Dockerfile

@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 RUN apt-get update && apt-get install -y \
  curl \
  gnupg \
-&& curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+&& curl -sL https://deb.nodesource.com/setup_12.x | bash - \
 && { \
  echo 'Package: nodejs'; \
  echo 'Pin: origin deb.nodesource.com'; \