From 8973dcc6dd434d9fa89b36fe2d8aa5f9e3ce0f91 Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Sat, 12 Oct 2019 15:07:50 +0200 Subject: [PATCH 1/5] Fix bcrypt install failing on node v10 Update bcrypt to version 3.0.6, as versions below 3 are not supported on node v10, and versions prior to 3.0.6 are not supported on node v12. --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc6b8b4f..433acaf9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ Version 1.2.2 to the current one in researchSync. - Fixed crash in researchSync when modded technologies are present only on some nodes. +- Fixed install failing due to bcrypt version less than 3 not being supported + on node v10. Version 1.2.1 diff --git a/package.json b/package.json index 43149858..a28335c6 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "as-table": "^1.0.31", "averaged-timeseries": "^1.4.0", "base64url": "^3.0.0", - "bcrypt": "^2.0.1", + "bcrypt": "^3.0.6", "bcrypt-promise": "^2.0.0", "body-parser": "^1.18.2", "cli": "^1.0.1", From 9e983aff84b051ccce220797a05708b62d5b8559 Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Sat, 12 Oct 2019 16:09:58 +0200 Subject: [PATCH 2/5] Reword development warning Reword the warning at the start of the readme to be less intimidating, as this is the correct version of the project that users are expected to install. --- README.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 16b35464..a8e0dd52 100644 --- a/README.md +++ b/README.md @@ -4,18 +4,17 @@

-# Warning - -Do not use master branch to run your Clusterio - master now is a development version and may not work - -Use latest stable release: https://github.com/clusterio/factorioClusterio/releases/latest - -Or clone latest stable branch that has name format `x.y.z` - # factorioClusterio Discord for development/support/play: https://discord.gg/5XuDkje +## Important notice + +This is the stable branch of the project. The +[master branch][http://github.com/clusterio/factorioClusterio/tree/master] +is undergoing significant changes that breaks compatibility to plugins and +existing installations and is not recommended for use. + ### Ways to support me/the project: * Contribute with code/documentation. Always nice to move the project forward From c25bf232864c7efa313640edb38133c1aacadda0 Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Sat, 12 Oct 2019 16:55:35 +0200 Subject: [PATCH 3/5] Reorder install instructions Reorder the install pm2 step to be after the npm install step in the instructions. This is necessary to avoid npm creating some files in the home directory owned as root and then failing the npm install step because of this. --- CHANGELOG.md | 2 ++ README.md | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 433acaf9..0d54573b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ Version 1.2.2 nodes. - Fixed install failing due to bcrypt version less than 3 not being supported on node v10. +- Reordered install instructions to avoid problem with npm creating files owned + by root in the home directory. Version 1.2.1 diff --git a/README.md b/README.md index a8e0dd52..5772f4b3 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,6 @@ Master and all slaves: sudo curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash - sudo apt install -y nodejs python-dev git wget curl tar build-essential - sudo npm install pm2 -g git clone -b 1.2.x https://github.com/Danielv123/factorioClusterio.git cd factorioClusterio curl -o factorio.tar.gz -L https://www.factorio.com/get-download/latest/headless/linux64 @@ -106,8 +105,11 @@ Master and all slaves: cp config.json.dist config.json node ./lib/npmPostinstall.js +downloads and installs nodejs, git and clusterio. To specify a version, change "latest" in the link to a version number like 0.14.21. -downloads and installs nodejs, pm2, git and clusterio. To specify a version, change "latest" in the link to a version number like 0.14.21. +Optional step (if you want to use pm2): + + sudo npm install pm2 -g Now you need to edit the `config.json` file. If you skip this step nothing will work. Pretty much all the blank fields should be filled in, except on the master where a few can be omitted. From 72b56a00c780d33193b74e0de2a5559799652c0a Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Sat, 12 Oct 2019 16:57:48 +0200 Subject: [PATCH 4/5] Swap curl with wget in install instructions Swap out curl with wget in the install instructions as wget is pre-installed on Ubuntu. --- CHANGELOG.md | 2 ++ README.md | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d54573b..b4c038bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ Version 1.2.2 on node v10. - Reordered install instructions to avoid problem with npm creating files owned by root in the home directory. +- Swapped curl out with wget in the install instructions as the latter comes + pre-installed on Ubuntu. Version 1.2.1 diff --git a/README.md b/README.md index 5772f4b3..7f4b5f26 100644 --- a/README.md +++ b/README.md @@ -95,11 +95,11 @@ NodeJS does not support EOL ubuntu releases. Make sure you are on the most recen Master and all slaves: - sudo curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash - - sudo apt install -y nodejs python-dev git wget curl tar build-essential + wget -O - https://deb.nodesource.com/setup_9.x | sudo -E bash - + sudo apt install -y nodejs python-dev git build-essential git clone -b 1.2.x https://github.com/Danielv123/factorioClusterio.git cd factorioClusterio - curl -o factorio.tar.gz -L https://www.factorio.com/get-download/latest/headless/linux64 + wget -O factorio.tar.gz https://www.factorio.com/get-download/latest/headless/linux64 tar -xf factorio.tar.gz npm install --only=production cp config.json.dist config.json From 9a032aed2e37e67233911de032e1361ea9d364de Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Wed, 21 Aug 2019 19:17:16 +0200 Subject: [PATCH 5/5] Backport use Node.js version 10 Update instructions, Dockerfile and Travis CI to use Node.js 10. Specify that Node.js version 10 or greater is needed in the engines section of package.json (note that this is only advisory.) And document this as a breaking change in CHANGELOG.md. This is a backport of 69a1ff7. --- .travis.yml | 2 +- CHANGELOG.md | 4 ++++ Dockerfile | 2 +- README.md | 4 ++-- package.json | 3 +++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93725d69..6c6cdd0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "9" + - 10 before_install: - sudo apt-get -qq update - sudo apt-get install -y curl git tar diff --git a/CHANGELOG.md b/CHANGELOG.md index b4c038bf..2a3faefe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,10 @@ Version 1.2.2 - Swapped curl out with wget in the install instructions as the latter comes pre-installed on Ubuntu. +### Breaking Changes + +- Node.js versions below 10 are no longer supported. + Version 1.2.1 ------------- diff --git a/Dockerfile b/Dockerfile index b754a329..17f2bb2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.11.2 +FROM node:10 RUN apt-get update && apt install git curl tar -y RUN mkdir factorioClusterio diff --git a/README.md b/README.md index 7f4b5f26..ac480c94 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ NodeJS does not support EOL ubuntu releases. Make sure you are on the most recen Master and all slaves: - wget -O - https://deb.nodesource.com/setup_9.x | sudo -E bash - + wget -O - https://deb.nodesource.com/setup_10.x | sudo -E bash - sudo apt install -y nodejs python-dev git build-essential git clone -b 1.2.x https://github.com/Danielv123/factorioClusterio.git cd factorioClusterio @@ -168,7 +168,7 @@ Game Client = The people connecting to the server **Requirements** -download and install nodeJS 8 or 9 from http://nodejs.org +download and install nodeJS 10 from http://nodejs.org download and install git from https://git-scm.com/ diff --git a/package.json b/package.json index a28335c6..d6172335 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,9 @@ ], "author": "Danielv123", "license": "MIT", + "engines": { + "node": ">=10" + }, "dependencies": { "as-table": "^1.0.31", "averaged-timeseries": "^1.4.0",