Ver Fonte

[misc] bump the dev-env to 3.3.4 and bump the node version to 10.22.1

Jakob Ackermann há 5 anos atrás
pai
commit
ba3b4f7dcd

+ 6 - 0
services/real-time/.github/dependabot.yml

@@ -15,3 +15,9 @@ updates:
     # Block informal upgrades -- security upgrades use a separate queue.
     # https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit
     open-pull-requests-limit: 0
+
+    # currently assign team-magma to all dependabot PRs - this may change in
+    # future if we reorganise teams
+    labels:
+      - "dependencies"
+      - "Team-Magma"

+ 1 - 1
services/real-time/.nvmrc

@@ -1 +1 @@
-10.21.0
+10.22.1

+ 1 - 1
services/real-time/Dockerfile

@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
 
-FROM node:10.21.0 as base
+FROM node:10.22.1 as base
 
 WORKDIR /app
 

+ 2 - 2
services/real-time/buildscript.txt

@@ -3,6 +3,6 @@ real-time
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
---node-version=10.21.0
+--node-version=10.22.1
 --public-repo=True
---script-version=3.3.2
+--script-version=3.3.4

+ 2 - 2
services/real-time/docker-compose.yml

@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:10.21.0
+    image: node:10.22.1
     volumes:
       - .:/app
     working_dir: /app
@@ -18,7 +18,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:10.21.0
+    image: node:10.22.1
     volumes:
       - .:/app
     working_dir: /app

+ 1 - 1
services/real-time/package.json

@@ -11,7 +11,7 @@
     "start": "node $NODE_APP_OPTIONS app.js",
     "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
     "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP",
-    "test:unit:_run": "mocha --recursive --reporter spec --timeout 5000 $@ test/unit/js",
+    "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js",
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "nodemon": "nodemon --config nodemon.json",
     "lint": "node_modules/.bin/eslint --max-warnings 0 .",