Skip to content

Commit 4909fcd

Browse files
committed
Adding CircleCI integration
1 parent 1ceba09 commit 4909fcd

File tree

7 files changed

+57
-6
lines changed

7 files changed

+57
-6
lines changed

.circleci/config.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
jobs:
3+
build:
4+
machine: true
5+
working_directory: ~/repo
6+
steps:
7+
- checkout
8+
- run: docker-compose up --build --abort-on-container-exit
9+
- store_test_results:
10+
path: xunit

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
.DS_Store
22
.env
33
.nyc_output/
4-
coverage/
54
/data/
6-
node_modules/
5+
/node_modules/
6+
/xunit/
77
Procfile
8-
yarn.lock

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
66
&& tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
77
&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
88

9-
RUN mkdir -p ~/app
9+
RUN mkdir -p /app
1010

11-
WORKDIR ~/app
11+
WORKDIR /app
1212

1313
COPY package.json .
1414
COPY package-lock.json .

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ rssCloud Server
33

44
rssCloud Server implementation in Node.js
55

6+
[![rssCloud Server 2.x](https://circleci.com/gh/andrewshell/rsscloud-server/tree/2.x.svg?style=shield)](https://circleci.com/gh/andrewshell/rsscloud-server/tree/2.x)
7+
68
## How to install
79

810
```bash

docker-compose.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@ services:
3535
MOCK_SERVER_PORT: 8002
3636
SECURE_MOCK_SERVER_URL: https://rsscloud-tests:8003
3737
SECURE_MOCK_SERVER_PORT: 8003
38+
volumes:
39+
- ./xunit:/app/xunit
3840
expose:
3941
- 8002
4042
- 8003
4143
depends_on:
4244
- mongodb
4345
- rsscloud
46+

package-lock.json

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"import-data": "node ./bin/import-data.js",
1010
"jshint": "jshint ./**/*.js",
1111
"eslint": "eslint --fix controllers/ services/ test/",
12-
"test": "mocha --timeout 10000",
12+
"test": "mocha -R mocha-multi --reporter-options spec=-,xunit=xunit/test-results.xml --timeout 10000",
1313
"test-api": "docker-compose up --build --abort-on-container-exit"
1414
},
1515
"engines": {
@@ -51,6 +51,7 @@
5151
"https": "^1.0.0",
5252
"jshint": "^2.12.0",
5353
"mocha": "^8.1.3",
54+
"mocha-multi": "^1.1.3",
5455
"nodemon": "2.0.4",
5556
"supertest": "^4.0.2"
5657
}

0 commit comments

Comments
 (0)