Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
66b09e2
release: version 3.1.2 (#689)
logan-r Jan 23, 2021
6095685
merge and resolve conflicts
logan-r Jan 27, 2021
2829f54
merge and resolve conflicts
logan-r Jan 27, 2021
4a7c200
Create node.js.yml
jamesxu123 Jun 19, 2021
7f5b91d
Update node.js.yml
jamesxu123 Jun 19, 2021
09b6a67
Update node.js.yml
jamesxu123 Jun 19, 2021
75d30c5
Update app.js
jamesxu123 Jun 19, 2021
abd6767
Update node.js.yml
jamesxu123 Jun 19, 2021
1a4fe34
Update node.js.yml
jamesxu123 Jun 19, 2021
fa56f41
Update node.js.yml
jamesxu123 Jun 19, 2021
7074079
Update node.js.yml
jamesxu123 Jun 19, 2021
7b6df35
Update node.js.yml
jamesxu123 Jun 20, 2021
5eff927
Update node.js.yml
jamesxu123 Jun 20, 2021
03402dd
Update node.js.yml
jamesxu123 Jun 20, 2021
aa52ae7
Update node.js.yml
jamesxu123 Jun 20, 2021
c8171e1
Update node.js.yml
jamesxu123 Jun 20, 2021
01a232e
Update node.js.yml
jamesxu123 Jun 20, 2021
dcabb85
Update node.js.yml
jamesxu123 Jun 20, 2021
f9d0ef8
Update node.js.yml
jamesxu123 Jun 20, 2021
f0a3a4d
Update node.js.yml
jamesxu123 Jun 20, 2021
a5c1dd0
Update package.json
jamesxu123 Jun 21, 2021
4cea357
Update account.test.js
jamesxu123 Jun 21, 2021
0df91eb
Update account.test.js
jamesxu123 Jun 21, 2021
e5bf79d
add elastic apm to see where tests are going wrong
jamesxu123 Jun 21, 2021
0ef97d7
move apm to app.js so it gets picked up by test
jamesxu123 Jun 21, 2021
63fb87e
add apm env to gh workflow
jamesxu123 Jun 21, 2021
5dde2ad
add missing envs
jamesxu123 Jun 21, 2021
6c59e30
Merge remote-tracking branch 'origin/feature/hac-32-investigate-new-c…
jamesxu123 Jun 21, 2021
37fbfbd
Merge remote-tracking branch 'origin/master' into feature/hac-32-inve…
jamesxu123 Jun 21, 2021
20126b7
remove debugging tools
jamesxu123 Jun 21, 2021
428c046
remove elastic apm
jamesxu123 Jun 21, 2021
f199173
run ci/cd on master as well
jamesxu123 Jun 21, 2021
3ba498c
Update .nvmrc
jamesxu123 Jun 21, 2021
b9fc935
Update package.json
jamesxu123 Jun 21, 2021
c9694e2
Delete .travis.yml
jamesxu123 Jun 21, 2021
ac539a2
Update package.json
jamesxu123 Jun 21, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches: [ dev, master ]
pull_request:
branches: [ dev, master ]

jobs:
build:
services:
mongodb:
image: mongo
ports:
- 27017:27017
environment: testing
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm test
env:
AUTH_PROVIDER_X509_CERT_URL: ${{ secrets.AUTH_PROVIDER_X509_CERT_URL }}
AUTH_URI: ${{ secrets.AUTH_URI }}
BUCKET_NAME: ${{ secrets.BUCKET_NAME }}
CLIENT_EMAIL: ${{ secrets.CLIENT_EMAIL }}
CLIENT_ID: ${{ secrets.CLIENT_ID }}
CLIENT_X509_CERT_URL: ${{ secrets.CLIENT_X509_CERT_URL }}
DB_ADDRESS_TEST: localhost:27017/hackerapi
# DB_ADDRESS_TEST: ${{ secrets.DB_ADDRESS_TEST }}
# DB_PASS_TEST: ${{ secrets.DB_PASS_TEST }}
# DB_USER_TEST: ${{ secrets.DB_USER_TEST }}
JWT_CONFIRM_ACC_SECRET: ${{ secrets.JWT_CONFIRM_ACC_SECRET }}
JWT_INVITE_SECRET: ${{ secrets.JWT_CONFIRM_ACC_SECRET }}
JWT_RESET_PWD_SECRET: ${{ secrets.JWT_RESET_PWD_SECRET }}
NO_REPLY_EMAIL: ${{ secrets.NO_REPLY_EMAIL }}
PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
PRIVATE_KEY_ID: ${{ secrets.PRIVATE_KEY_ID }}
PROJECT_ID: ${{ secrets.PROJECT_ID }}
SENDGRID_API_KEY: ${{ secrets.SENDGRID_API_KEY }}
TOKEN_URI: ${{ secrets.TOKEN_URI }}
TYPE: ${{ secrets.TYPE }}
PORT: 3000
ADDRESS: localhost
COOKIE_SECRET: ${{ secrets.COOKIE_SECRET }}
# we don't currently have hosted elastic apm
# ELASTIC_APM_SERVICE_NAME: ${{ secrets.ELASTIC_APM_SERVICE_NAME }}
# ELASTIC_APM_SECRET_TOKEN: ${{ secrets.ELASTIC_APM_SECRET_TOKEN }}
# ELASTIC_APM_SERVER_URL: ${{ secrets.ELASTIC_APM_SERVER_URL }}
FRONTEND_ADDRESS_DEV: localhost:1337
FRONTEND_ADDRESS_DEPLOY: app.mchacks.ca
10 changes: 9 additions & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.17.0
v14
20 changes: 0 additions & 20 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Services = {

const envLoadResult = Services.env.load(path.join(__dirname, "./.env"));
if (envLoadResult.error) {
Services.log.error(envLoadResult.error);
Services.log.warn(envLoadResult.error);
}

const passport = require("passport");
Expand Down
1 change: 0 additions & 1 deletion bin/www.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/**
* Module dependencies.
*/

const app = require("../app").app;
const debug = require("debug")("hackboard:server");
const http = require("http");
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"lint": "eslint --fix '**/*.js'"
},
"engines": {
"node": "10.17.0"
"node": "14.x"
},
"dependencies": {
"@google-cloud/storage": "^5.5.0",
Expand Down