Skip to content
This repository was archived by the owner on Mar 28, 2022. It is now read-only.

Commit 357f168

Browse files
javierbreajavierbrea
authored
Merge pull request #77 from mocks-server/release
Release v1.4.7
2 parents 3d48ec2 + e9eabc3 commit 357f168

34 files changed

+170
-49
lines changed

‎.github/workflows/build.yml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: build
2+
on:
3+
push:
4+
branches:
5+
- master
6+
- release
7+
pull_request:
8+
jobs:
9+
test:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
node: ["12.19.0", "14.15.0", "15.2.0"]
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
- name: Extract branch name
18+
shell: bash
19+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF##*/})"
20+
id: extract-branch
21+
- name: Use Node.js
22+
uses: actions/setup-node@v1
23+
with:
24+
node-version: ${{ matrix.node }}
25+
- name: Cache node modules
26+
uses: actions/cache@v2
27+
env:
28+
cache-name: cache-node-modules
29+
with:
30+
# npm cache files are stored in `~/.npm` on Linux/macOS
31+
path: ~/.npm
32+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
33+
restore-keys: |
34+
${{ runner.os }}-build-${{ env.cache-name }}-
35+
${{ runner.os }}-build-
36+
${{ runner.os }}-
37+
- name: Install dependencies
38+
run: npm ci
39+
- name: Lint
40+
run: npm run lint
41+
- name: Test unit
42+
run: npm run test:unit
43+
- name: Test E2E
44+
run: npm run test:e2e
45+
id: test-e2e
46+
- name: Upload test results
47+
uses: actions/upload-artifact@v2
48+
with:
49+
name: coverage-${{ matrix.node }}
50+
path: coverage
51+
retention-days: 1
52+
quality:
53+
runs-on: ubuntu-latest
54+
needs: test
55+
steps:
56+
- name: Checkout
57+
uses: actions/checkout@v2
58+
- name: Download test results
59+
uses: actions/download-artifact@v2
60+
with:
61+
name: coverage-15.2.0
62+
path: coverage
63+
- name: Coveralls
64+
uses: coverallsapp/github-action@master
65+
with:
66+
github-token: ${{ secrets.GITHUB_TOKEN }}
67+
- name: SonarCloud Scan
68+
if: env.SONAR_TOKEN != ''
69+
uses: sonarsource/sonarcloud-github-action@master
70+
env:
71+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

‎.github/workflows/check-package-version.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: check-package-version
2+
on:
3+
pull_request:
4+
branches:
5+
- master
6+
jobs:
7+
check-package-version:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v2
12+
- name: Get NPM version is new
13+
id: check
14+
uses: EndBug/version-check@v1.6.0
15+
with:
16+
diff-search: true
17+
file-name: ./package.json
18+
file-url: https://unpkg.com/@mocks-server/plugin-admin-api@latest/package.json
19+
static-checking: localIsNew
20+
- name: Check version is new
21+
if: steps.check.outputs.changed != 'true'
22+
run: |
23+
echo "Version not changed"
24+
exit 1
25+
- name: Get NPM version
26+
id: package-version
27+
uses: martinbeentjes/npm-get-version-action@v1.1.0
28+
- name: Check Changelog version
29+
id: changelog_reader
30+
uses: mindsers/changelog-reader-action@v2.0.0
31+
with:
32+
version: ${{ steps.package-version.outputs.current-version }}
33+
path: ./CHANGELOG.md
34+
- name: Read version from Sonar config
35+
id: sonar-version
36+
uses: christian-draeger/read-properties@1.0.1
37+
with:
38+
path: './sonar-project.properties'
39+
property: 'sonar.projectVersion'
40+
- name: Check Sonar version
41+
if: steps.sonar-version.outputs.value != steps.package-version.outputs.current-version
42+
run: |
43+
echo "Version not changed"
44+
exit 1

‎.github/workflows/publish-to-github.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: publish-to-github
2+
on:
3+
release:
4+
types: [created]
5+
jobs:
6+
publish:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- uses: actions/setup-node@v1
11+
with:
12+
node-version: '12.x'
13+
registry-url: 'https://npm.pkg.github.com'
14+
# Defaults to the user or organization that owns the workflow file
15+
scope: '@mocks-server'
16+
- run: npm publish
17+
env:
18+
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/publish-to-npm.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: publish-to-npm
2+
on:
3+
release:
4+
types: [created]
5+
jobs:
6+
publish:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- uses: actions/setup-node@v1
11+
with:
12+
node-version: '12.x'
13+
registry-url: 'https://registry.npmjs.org/'
14+
- run: npm publish
15+
env:
16+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# tests
1010
/coverage
1111
/mocks
12-
/test/acceptance/fixtures/files-watch
12+
/test/e2e/fixtures/files-watch
1313

1414
# misc
1515
.DS_Store

‎.travis.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1414
### Fixed
1515
### Removed
1616

17+
## [1.4.7] - 2020-12-21
18+
19+
### Added
20+
- chore(deps): Add support for Node.js v15.x
21+
22+
### Changed
23+
- chore(ci): Migrate from Travis CI to github actions
24+
- test(e2e): Rename acceptance tests into e2e tests
25+
1726
## [1.4.6] - 2020-10-27
1827
### Changed
1928
- chore(deps): Update dependencies

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build status][travisci-image]][travisci-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Quality Gate][quality-gate-image]][quality-gate-url]
1+
[![Build status][build-image]][build-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Quality Gate][quality-gate-image]][quality-gate-url]
22

33
[![NPM dependencies][npm-dependencies-image]][npm-dependencies-url] [![Renovate](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovatebot.com) [![Last commit][last-commit-image]][last-commit-url] [![Last release][release-image]][release-url]
44

@@ -51,8 +51,8 @@ Please read the [contributing guidelines](.github/CONTRIBUTING.md) and [code of
5151

5252
[coveralls-image]: https://coveralls.io/repos/github/mocks-server/plugin-admin-api/badge.svg
5353
[coveralls-url]: https://coveralls.io/github/mocks-server/plugin-admin-api
54-
[travisci-image]: https://travis-ci.com/mocks-server/plugin-admin-api.svg?branch=master
55-
[travisci-url]: https://travis-ci.com/mocks-server/plugin-admin-api
54+
[build-image]: https://github.com/mocks-server/plugin-admin-api/workflows/build/badge.svg?branch=master
55+
[build-url]: https://github.com/mocks-server/plugin-admin-api/actions?query=workflow%3Abuild+branch%3Amaster
5656
[last-commit-image]: https://img.shields.io/github/last-commit/mocks-server/plugin-admin-api.svg
5757
[last-commit-url]: https://github.com/mocks-server/plugin-admin-api/commits
5858
[license-image]: https://img.shields.io/npm/l/@mocks-server/plugin-admin-api.svg

‎jest.acceptance.config.js renamed to ‎jest.e2e.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = {
55
// Automatically clear mock calls and instances between every test
66
clearMocks: true,
77

8-
testMatch: ["**/test/acceptance/**/?(*.)+(spec|test).js?(x)"],
8+
testMatch: ["**/test/e2e/**/?(*.)+(spec|test).js?(x)"],
99

1010
// Indicates whether the coverage information should be collected while executing the test
1111
collectCoverage: false,

‎package-lock.json

Lines changed: 1 addition & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)