Skip to content
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d267051
chore: node 12.16.3 -> 16.15.0
keeler May 29, 2022
da19113
chore: npm audit fix
keeler May 29, 2022
9e00685
chore: Add .nvmrc
keeler May 29, 2022
d636bfb
feat: Add Makefile
keeler May 29, 2022
bf5ca74
chore: Github workflow use npm ci
keeler May 29, 2022
5fbc461
wip: Attempt at better docker build caching
keeler May 29, 2022
b62b9d3
docs: Makefile help target
keeler May 29, 2022
92327e9
feat: Don't need git in docker image
keeler May 29, 2022
cfeb1bf
refactor: CI pipeline use docker image
keeler May 30, 2022
d37a9f3
fix: Hide news if no message of the day
keeler May 30, 2022
528a1c0
fix: Broke editorconfig
keeler May 30, 2022
2bddf77
fix: Docker env from arg invalidates cache
keeler May 30, 2022
d7f1a04
fix: Shallow clone doesn't include tags
keeler May 31, 2022
2700269
fix: Use fetch-depth 0 to get tag history
keeler May 31, 2022
45ed0da
feedback: Undo Dockerfile & CI refactor
keeler Jun 1, 2022
d5ffbdd
chore: Update node in github action
keeler Jun 1, 2022
3065591
feedback: Direct developers to install Node 16 not 12
keeler Jun 2, 2022
6e4aa08
feedback: Use lts-alpine to keep image version up-to-date
keeler Jun 2, 2022
395d99e
feedback: Current LTS is 16.15.1
keeler Jun 2, 2022
cbab064
npm ci in ci
tooomm Jun 2, 2022
aebd8bf
do not fail-fast on single job failure
tooomm Jun 2, 2022
19ec2a3
chore: Dependency '@hapi/joi' -> 'joi'
keeler Jun 3, 2022
113aef9
hack: sed -i 's/git+ssh/git+https/g' package-lock.json
keeler Jun 3, 2022
b90bbb5
Revert "hack: sed -i 's/git+ssh/git+https/g' package-lock.json"
keeler Jun 3, 2022
5083990
hack: Do sed trick conditionally in CI pipeline
keeler Jun 3, 2022
287f4e2
feedback: Github actions support 'if' conditions
keeler Jun 3, 2022
ecede51
fix gha
tooomm Jun 4, 2022
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
17 changes: 13 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ jobs:
name: Run tests

strategy:
fail-fast: false
matrix:
node_version:
- 12
- 14
- 16

runs-on: ubuntu-latest

Expand All @@ -33,8 +34,16 @@ jobs:
with:
node-version: ${{matrix.node_version}}

# See https://github.com/npm/cli/issues/2610
- name: Hack for Node 14
run: |
if [[ "${{matrix.node_version}}" = "14" ]]; then
sed -i 's/git+ssh/git+https/g' package-lock.json
fi
exit 0
Comment thread
keeler marked this conversation as resolved.
Outdated

- name: Install
run: npm install
run: npm ci

- name: Test
run: npm test
Expand Down Expand Up @@ -78,10 +87,10 @@ jobs:
- name: Setup
uses: actions/setup-node@v2.5.1
with:
node-version: 12
node-version: 16

- name: Install
run: npm install --ignore-scripts
run: npm ci --ignore-scripts

- name: Run ESLint
run: npm run lint
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12
16.15.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN chown dr4ftuser -R .
USER dr4ftuser

# Install the dependencies
RUN npm install
RUN npm ci

# Publish the port 1337
EXPOSE 1337
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ It supports all their features, and many more.

### Native

1) Install [Node.js](https://nodejs.org/en/download/) >= 12.0.0
1) Install [Node.js](https://nodejs.org/en/download/) >= 16.0.0. Alternatively, install [nvm](https://github.com/nvm-sh/nvm) and then run `nvm use` in this repo, which will install the correct Node version for this repo as defined in the `.nvmrc` file.
2) Run<br>
`$ npm install`<br>
`$ npm ci`<br>
`$ npm run build`<br>
`$ npm start`
3) Visit [http://localhost:1337](http://localhost:1337)
Expand Down Expand Up @@ -131,7 +131,7 @@ Breakpoints for the frontend should be set in your browser console.

Be a part of this project! You can run the test using the following.

1. Install dependencies from package.json by running `npm install`
1. Install dependencies from package.json by running `npm ci`
Comment thread
tooomm marked this conversation as resolved.
2. Run the test via `npm test`
3. Make some fun new modules!

Expand Down
2 changes: 1 addition & 1 deletion config/app.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const joi = require("@hapi/joi");
const joi = require("joi");

const envVarsSchema = joi.object({
PORT: joi.number()
Expand Down
2 changes: 1 addition & 1 deletion config/logger.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const joi = require("@hapi/joi");
const joi = require("joi");

const envVarsSchema = joi.object({
LOGGER_LEVEL: joi.string()
Expand Down
Loading