Downstream Sync

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Troubleshooting Documentation
+    url: http://nightscout.github.io/troubleshoot/troublehoot/
+    about: Having trouble with Nightscout? Please check our step by step troubleshooting instructions.
+  - name: Nightscout Community Support in Facebook
+    url: https://www.facebook.com/groups/cgminthecloud
+    about: If you're a Nightscout user and have trouble with your site, please post questions here. We don't have the resources to answer support questions posted here as tickets.
+  - name: Nightscout Community Support in Discord
+    url: https://discord.gg/zg7CvCQ
+    about: If you're a Nightscout user and have trouble with your site, please post questions here. We don't have the resources to answer support questions posted here as tickets.

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,68 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+# ******** NOTE ********
+
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '43 23 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/main.yml

@@ -1,34 +1,93 @@
-name: CI test
+name: CI test and publish Docker image
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - dev
+  pull_request:
+    branches:
+      - master
+      - dev
 
 jobs:
-  build:
-
-    runs-on: ubuntu-16.04
-
+  test:
+    name: Run Tests
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [12.x, 14.x]
+        mongodb-version: [4.2, 4.4]
+
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Start MongoDB ${{ matrix.mongodb-version }}
+        uses: supercharge/[email protected]
+        with:
+          mongodb-version: ${{ matrix.mongodb-version }}
+
+      - name: Install dependencies
+        run: npm install
+      - name: Run Tests
+        run: npm run-script test-ci
+      - name: Send Coverage
+        run: npm run-script coverage
+
+  publish_dev:
+    name: Publish dev branch to Docker Hub
+    needs: test
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/dev' && github.repository_owner == 'nightscout'
+    env:
+      DOCKER_IMAGE: nightscout/cgm-remote-monitor
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+      - name: Clean git Checkout
+        if: success()
+        uses: actions/checkout@v2
+      - name: Build, tag and push the dev Docker image
+        if: success()
+        run: |
+          docker build --no-cache=true -t ${{ env.DOCKER_IMAGE }}:dev_${{ github.sha }} .
+          docker image push ${{ env.DOCKER_IMAGE }}:dev_${{ github.sha }}
+          docker tag ${{ env.DOCKER_IMAGE }}:dev_${{ github.sha }} ${{ env.DOCKER_IMAGE }}:latest_dev
+          docker image push ${{ env.DOCKER_IMAGE }}:latest_dev
 
+  publish_master:
+    name: Publish master branch to Docker Hub
+    needs: test
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master' && github.repository_owner == 'nightscout'
+    env:
+      DOCKER_IMAGE: nightscout/cgm-remote-monitor
     steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: Install dependencies
-      run: npm install
-    - name: Install MongoDB
-      run: |
-        wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add -
-        echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/4.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.4.list
-        sudo apt-get update
-        sudo apt-get install -y mongodb-org
-        sudo apt-get install -y --allow-downgrades mongodb-org=4.4.0 mongodb-org-server=4.4.0 mongodb-org-shell=4.4.0 mongodb-org-mongos=4.4.0 mongodb-org-tools=4.4.0
-    - name: Start MongoDB
-      run: sudo systemctl start mongod
-    - name: Run Tests
-      run: npm run-script test-ci
-    - name: Send Coverage
-      run: npm run-script coverage
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+      - name: Clean git Checkout
+        if: success()
+        uses: actions/checkout@v2
+      - name: get-npm-version
+        if: success()
+        id: package-version
+        uses: martinbeentjes/npm-get-version-action@master
+      - name: Build, tag and push the master Docker image
+        if: success()
+        run: |
+          docker build --no-cache=true -t ${{ env.DOCKER_IMAGE }}:${{ steps.package-version.outputs.current-version }} .
+          docker image push ${{ env.DOCKER_IMAGE }}:${{ steps.package-version.outputs.current-version }}
+          docker tag ${{ env.DOCKER_IMAGE }}:${{ steps.package-version.outputs.current-version }} ${{ env.DOCKER_IMAGE }}:latest
+          docker image push ${{ env.DOCKER_IMAGE }}:latest

.nvmrc

@@ -1 +1 @@
-10.16.0
+14.15.3

CONTRIBUTING.md

@@ -15,7 +15,6 @@
   - [List of Contributors](#list-of-contributors)
     - [Core developers, contributing developers, coordinators and documentation writers](#core-developers-contributing-developers-coordinators-and-documentation-writers)
     - [Plugin contributors](#plugin-contributors)
-    - [Translators](#translators)
     - [List of all contributors](#list-of-all-contributors)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -36,6 +35,10 @@
 [discord-img]: https://img.shields.io/discord/629952586895851530?label=discord%20chat
 [discord-url]: https://discord.gg/rTKhrqz
 
+## Translations
+
+Please visit our [project in Crowdin](https://crowdin.com/project/nightscout) to translate Nigthscout. If you want to add a new language, please get in touch with the dev team in [Discord][discord-url].
+
 ## Installation for development
 
 Nightscout is a Node.js application. The basic installation of the software for local purposes is:
@@ -188,8 +191,6 @@ Also if you can't code, it's possible to contribute by improving the documentati
 | Core developers:                      | [@jasoncalabrese] [@MilosKozak] [@PieterGit] [@sulkaharo] | 
 | Former Core developers: (not active): | [@bewest] |
 | Contributing developers:              | [@jpcunningh] [@scottleibrand] [@komarserjio] [@jweismann] |
-| Release coordination 0.10.x:          | [@PieterGit] [@sulkaharo] |
-| Release coordination 0.11.x:          | [@PieterGit] |
 | Issue/Pull request coordination:      | Please volunteer |
 | Cleaning up git fork spam:            | Please volunteer |
 | Documentation writers:                | [@andrew-warrington] [@unsoluble] [@tynbendad] [@danamlewis] [@rarneson] |
@@ -230,41 +231,6 @@ Also if you can't code, it's possible to contribute by improving the documentati
 | [`upbat` (Uploader Battery)](README.md#upbat-uploader-battery)| [@jpcunningh] | Please volunteer |
 | [`xdrip-js` (xDrip-js)](README.md#xdrip-js-xdrip-js)| [@jpcunningh] | Please volunteer |
 
-### Translators
-
-See `/translations` of your Nightscout, to view the current translation coverage and the missing items.
-Languages with less than 90% coverage will be removed in a future Nightscout versions.
-
-| Language      | List of translators | Status
-| ------------- | -------------------- |-------------------- |
-| Български (`bg`) |Please volunteer| OK |
-| Čeština (`cs`) |Please volunteer|OK |
-| Deutsch (`de`) |[@viderehh] [@herzogmedia] |OK |
-| Dansk (`dk`)  | [@janrpn] |OK |
-| Ελληνικά (`el`)|Please volunteer|Needs attention: 68.5%|
-| English (`en`)|Please volunteer|OK|
-| Español (`es`) |Please volunteer|OK|
-| Suomi (`fi`)|[@sulkaharo] |OK|
-| Français (`fr`)|Please volunteer|OK|
-| עברית (`he`)| [@jakebloom] |OK|
-| Hrvatski (`hr`)|[@OpossumGit]|OK|
-| Italiano (`it`)|Please volunteer|OK|
-| 日本語 (`ja`)|[@LuminaryXion]|Working on this|
-| 한국어 (`ko`)|Please volunteer|Needs attention: 80.6%|
-| Norsk (Bokmål) (`nb`)|Please volunteer|OK|
-| Nederlands (`nl`)|[@PieterGit]|OK|
-| Polski (`pl`)|[@Bartlomiejsz]|OK|
-| Português (Brasil) (`pt`)|Please volunteer|OK|
-| Română (`ro`)|Please volunteer|OK|
-| Русский (`ru`)|[@apanasef]|OK|
-| Slovenčina (`sk`)|Please volunteer|OK|
-| Svenska (`sv`)|Please volunteer|OK|
-| Türkçe (`tr`)|[@diabetlum]|OK|
-| 中文（简体） (`zh_cn`) | [@jizhongwen]|OK|
-| 中文（繁體） (`zh_tw`) | [@jizhongwen]|Needs attention: 25.0%
-| 日本語 (`ja_jp`) | [@LuminaryXion]|
-
-
 ### List of all contributors
 | Contribution area                     | List of contributors |
 | ------------------------------------- | -------------------- |

Dockerfile.example → Dockerfile

@@ -1,6 +1,6 @@
-FROM node:10-alpine
+FROM node:14.15.3-alpine
 
-MAINTAINER Nightscout Contributors
+LABEL maintainer="Nightscout Contributors"
 
 RUN mkdir -p /opt/app
 ADD . /opt/app

Makefile

@@ -15,7 +15,7 @@ MONGO_SETTINGS=MONGO_CONNECTION=${MONGO_CONNECTION} \
 # coverage reporter's ability to instrument the tests correctly.
 # Hard coding it to the local with our pinned version is bigger for
 # initial installs, but ensures a consistent environment everywhere.
-# On Travis, ./node_modules/.bin and other `nvm` and `npm` bundles are
+# On GA, ./node_modules/.bin and other `nvm` and `npm` bundles are
 # inserted into the default `$PATH` enviroinment, making pointing to
 # the unwrapped mocha executable necessary.
 MOCHA=./node_modules/mocha/bin/_mocha
@@ -25,7 +25,7 @@ ANALYZED=./coverage/lcov.info
 # Following token deprecated
 # export CODACY_REPO_TOKEN=e29ae5cf671f4f918912d9864316207c
 
-DOCKER_IMAGE=nightscout/cgm-remote-monitor-travis
+DOCKER_IMAGE=nightscout/cgm-remote-monitor
 
 all: test
 
@@ -48,7 +48,7 @@ test_onebyone:
 test:
 	${MONGO_SETTINGS} ${MOCHA} --timeout 30000 --exit --bail -R tap ${TESTS}
 
-travis:
+ci_tests:
 	python -c 'import os,sys,fcntl; flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL); fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK);'
 #	NODE_ENV=test ${MONGO_SETTINGS} \
 #	${ISTANBUL} cover ${MOCHA} --report lcovonly -- --timeout 5000 -R tap ${TESTS}	
@@ -57,28 +57,25 @@ travis:
 docker_release:
 	# Get the version from the package.json file
 	$(eval DOCKER_TAG=$(shell cat package.json | jq '.version' | tr -d '"'))
-	$(eval NODE_VERSION=$(shell cat .nvmrc))
+	$(eval BRANCH=$(lastword $(subst /, ,$(GITHUB_REF))))
 	#
-	# Create a Dockerfile that contains the correct NodeJS version
-	cat Dockerfile.example | sed -e "s/^FROM node:.*/FROM node:${NODE_VERSION}/" > Dockerfile
 	#
 	# Rebuild the image. We do this with no-cache so that we have all security upgrades,
 	# since that's more important than fewer layers in the Docker image.
 	docker build --no-cache=true -t $(DOCKER_IMAGE):$(DOCKER_TAG) .
-	# Push an image to Docker Hub with the version from package.json:
-	docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
 	#
 	# Push the master branch to Docker hub as 'latest'
-	if [ "$(TRAVIS_BRANCH)" = "master" ]; then \
+	if [ "$(BRANCH)" = "master" ]; then \
 		docker tag $(DOCKER_IMAGE):$(DOCKER_TAG) $(DOCKER_IMAGE):latest && \
+		docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
 		docker push $(DOCKER_IMAGE):latest; \
 	fi
 	#
 	# Push the dev branch to Docker Hub as 'latest_dev'
-	if [ "$(TRAVIS_BRANCH)" = "dev" ]; then \
+	if [ "$(BRANCH)" = "dev" ]; then \
 		docker tag $(DOCKER_IMAGE):$(DOCKER_TAG) $(DOCKER_IMAGE):latest_dev && \
+		docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
 		docker push $(DOCKER_IMAGE):latest_dev; \
 	fi
-	rm -f Dockerfile
 
-.PHONY: all coverage docker_release report test travis
+.PHONY: all coverage docker_release report test ci_tests