Sfoglia il codice sorgente

[misc] update the build scripts to 1.3.5

Jakob Ackermann 6 anni fa
parent
commit
f901064a59

+ 3 - 12
services/notifications/.eslintrc

@@ -1,7 +1,7 @@
 // this file was auto-generated, do not edit it directly.
 // this file was auto-generated, do not edit it directly.
 // instead run bin/update_build_scripts from
 // instead run bin/update_build_scripts from
 // https://github.com/sharelatex/sharelatex-dev-environment
 // https://github.com/sharelatex/sharelatex-dev-environment
-// Version: 1.3.1
+// Version: 1.3.5
 {
 {
   "extends": [
   "extends": [
     "standard",
     "standard",
@@ -28,7 +28,7 @@
   "overrides": [
   "overrides": [
     {
     {
       // Test specific rules
       // Test specific rules
-      "files": ["**/test/*/src/**/*.js"],
+      "files": ["test/**/*.js"],
       "globals": {
       "globals": {
         "expect": true
         "expect": true
       },
       },
@@ -53,18 +53,9 @@
         "mocha/prefer-arrow-callback": "error"
         "mocha/prefer-arrow-callback": "error"
       }
       }
     },
     },
-    {
-      // Frontend test specific rules
-      "files": ["**/test/frontend/**/*.js"],
-      "globals": {
-        "expect": true,
-        "define": true,
-        "$": true
-      }
-    },
     {
     {
       // Backend specific rules
       // Backend specific rules
-      "files": ["**/app/src/**/*.js"],
+      "files": ["app/**/*.js", "app.js", "index.js"],
       "rules": {
       "rules": {
         // don't allow console.log in backend code
         // don't allow console.log in backend code
         "no-console": "error"
         "no-console": "error"

+ 1 - 1
services/notifications/.prettierrc

@@ -1,7 +1,7 @@
 # This file was auto-generated, do not edit it directly.
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.3.1
+# Version: 1.3.5
 {
 {
   "semi": false,
   "semi": false,
   "singleQuote": true
   "singleQuote": true

+ 5 - 5
services/notifications/Dockerfile

@@ -1,12 +1,14 @@
 # This file was auto-generated, do not edit it directly.
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.3.1
+# Version: 1.3.5
 
 
-FROM node:10.19.0 as app
+FROM node:10.19.0 as base
 
 
 WORKDIR /app
 WORKDIR /app
 
 
+FROM base as app
+
 #wildcard as some files may not be in all repos
 #wildcard as some files may not be in all repos
 COPY package*.json npm-shrink*.json /app/
 COPY package*.json npm-shrink*.json /app/
 
 
@@ -16,11 +18,9 @@ COPY . /app
 
 
 
 
 
 
-FROM node:10.19.0
+FROM base
 
 
 COPY --from=app /app /app
 COPY --from=app /app /app
-
-WORKDIR /app
 USER node
 USER node
 
 
 CMD ["node", "--expose-gc", "app.js"]
 CMD ["node", "--expose-gc", "app.js"]

+ 6 - 1
services/notifications/Makefile

@@ -1,7 +1,7 @@
 # This file was auto-generated, do not edit it directly.
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.3.1
+# Version: 1.3.5
 
 
 BUILD_NUMBER ?= local
 BUILD_NUMBER ?= local
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
@@ -33,9 +33,14 @@ test_unit:
 
 
 test_acceptance: test_clean test_acceptance_pre_run test_acceptance_run
 test_acceptance: test_clean test_acceptance_pre_run test_acceptance_run
 
 
+test_acceptance_debug: test_clean test_acceptance_pre_run test_acceptance_run_debug
+
 test_acceptance_run:
 test_acceptance_run:
 	@[ ! -d test/acceptance ] && echo "notifications has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance
 	@[ ! -d test/acceptance ] && echo "notifications has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance
 
 
+test_acceptance_run_debug:
+	@[ ! -d test/acceptance ] && echo "notifications has no acceptance tests" || $(DOCKER_COMPOSE) run -p 127.0.0.9:19999:19999 --rm test_acceptance npm run test:acceptance -- --inspect=0.0.0.0:19999 --inspect-brk
+
 test_clean:
 test_clean:
 	$(DOCKER_COMPOSE) down -v -t 0
 	$(DOCKER_COMPOSE) down -v -t 0
 
 

+ 1 - 1
services/notifications/buildscript.txt

@@ -7,4 +7,4 @@ notifications
 --dependencies=mongo,redis
 --dependencies=mongo,redis
 --docker-repos=gcr.io/overleaf-ops
 --docker-repos=gcr.io/overleaf-ops
 --env-pass-through=
 --env-pass-through=
---script-version=1.3.1
+--script-version=1.3.5

+ 2 - 2
services/notifications/docker-compose.ci.yml

@@ -1,9 +1,9 @@
 # This file was auto-generated, do not edit it directly.
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.3.1
+# Version: 1.3.5
 
 
-version: "2.1"
+version: "2.3"
 
 
 services:
 services:
   test_unit:
   test_unit:

+ 2 - 2
services/notifications/docker-compose.yml

@@ -1,9 +1,9 @@
 # This file was auto-generated, do not edit it directly.
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.3.1
+# Version: 1.3.5
 
 
-version: "2.1"
+version: "2.3"
 
 
 services:
 services:
   test_unit:
   test_unit: