From 9fc8e211f8081d22dec7260a5869d13acc251230 Mon Sep 17 00:00:00 2001 From: kushthedude Date: Sat, 18 Jan 2020 21:13:01 +0530 Subject: [PATCH 1/6] Bump node version --- .travis.yml | 3 +-- package.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc9bbcccbe3..1146e9287f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: node_js node_js: - - "8" -# - "10" + - "12" # sudo: required diff --git a/package.json b/package.json index f618ecf3f96..a29116b9b66 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "xgettext-template": "^3.4.2" }, "engines": { - "node": "8.* || >= 10.*", + "node": ">= 10.*", "yarn": ">= 1.0.0" }, "private": true, From dce389171c252d68ef21d2a7042d0e289321b3ba Mon Sep 17 00:00:00 2001 From: kushthedude Date: Sat, 18 Jan 2020 21:38:11 +0530 Subject: [PATCH 2/6] bump yarn --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a29116b9b66..f74f66e6431 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ }, "engines": { "node": ">= 10.*", - "yarn": ">= 1.0.0" + "yarn": ">= 1.2.0" }, "private": true, "dependencies": { From c11e5a93fbab3d6dc3c019f4dbb9b3c0b88e4b0b Mon Sep 17 00:00:00 2001 From: kushthedude Date: Sat, 18 Jan 2020 21:13:01 +0530 Subject: [PATCH 3/6] Bump yarn/node and remove unuses scripts --- .travis.yml | 3 +-- Dockerfile | 2 +- package.json | 4 ++-- scripts/pr_deploy.sh | 21 --------------------- 4 files changed, 4 insertions(+), 26 deletions(-) delete mode 100755 scripts/pr_deploy.sh diff --git a/.travis.yml b/.travis.yml index bc9bbcccbe3..1146e9287f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: node_js node_js: - - "8" -# - "10" + - "12" # sudo: required diff --git a/Dockerfile b/Dockerfile index 59c309a0099..0764431c683 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN node scripts/l10n.js generate && \ ## ## -FROM node:10-alpine +FROM node:12.14.1-alpine3.9 WORKDIR /fastboot diff --git a/package.json b/package.json index f618ecf3f96..b788ed4f9a5 100644 --- a/package.json +++ b/package.json @@ -131,8 +131,8 @@ "xgettext-template": "^3.4.2" }, "engines": { - "node": "8.* || >= 10.*", - "yarn": ">= 1.0.0" + "node": ">= 12.*", + "yarn": ">= 1.2.0" }, "private": true, "dependencies": { diff --git a/scripts/pr_deploy.sh b/scripts/pr_deploy.sh deleted file mode 100755 index 6d0c838e1a4..00000000000 --- a/scripts/pr_deploy.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - echo "Not a PR. Skipping surge deployment" - exit 0 -fi - -ember build production - -export REPO_SLUG_ARRAY=(${TRAVIS_REPO_SLUG//\// }) -export REPO_OWNER=${REPO_SLUG_ARRAY[0]} -export REPO_NAME=${REPO_SLUG_ARRAY[1]} - -npm i -g surge - -export SURGE_LOGIN=test@example.co.in -# Token of a dummy account. So can be added to vcs -export SURGE_TOKEN=d1c28a7a75967cc2b4c852cca0d12206 - -export DEPLOY_DOMAIN=https://pr-${TRAVIS_PULL_REQUEST}-${REPO_NAME}-${REPO_OWNER}.surge.sh -surge --project ./dist --domain $DEPLOY_DOMAIN; -curl https://opev-frontend-commenter.herokuapp.com?id=${TRAVIS_PULL_REQUEST} From f6e30043ec7015fa0b8e3acdb5c396e668c9d9f2 Mon Sep 17 00:00:00 2001 From: Kush Trivedi Date: Sat, 18 Jan 2020 22:06:57 +0530 Subject: [PATCH 4/6] Test Commit for netlify --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1146e9287f3..538277e5b58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: node_js node_js: - "12" + # sudo: required # services: From f73de9006ab32d347f62d2e560e7f9848e8ec836 Mon Sep 17 00:00:00 2001 From: Kush Trivedi Date: Wed, 22 Jan 2020 16:28:11 +0530 Subject: [PATCH 5/6] Matching node version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0764431c683..8d6b025d1c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN node scripts/l10n.js generate && \ ## ## -FROM node:12.14.1-alpine3.9 +FROM node:12-alpine WORKDIR /fastboot From 0cb503cdacf3646de99fba9684e4bf0fe6434a09 Mon Sep 17 00:00:00 2001 From: kushthedude Date: Wed, 22 Jan 2020 17:47:28 +0530 Subject: [PATCH 6/6] netlify fix --- netlify.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netlify.toml b/netlify.toml index bf2792bc12f..f464a54268f 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,5 @@ +[build.environment] +NODE_VERSION = "12" [context.production] command = "ember build -prod" [context.production.environment]