Skip to content

Commit

Permalink
Merge branch 'release/0.13.4' into npm
Browse files Browse the repository at this point in the history
  • Loading branch information
mashpie committed Dec 29, 2021
2 parents 0c20329 + bdce606 commit 9683cc6
Show file tree
Hide file tree
Showing 9 changed files with 2,761 additions and 4,025 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# This workflow will do a clean install of node dependencies, cache/restore them, 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: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [12.x, 14.x, 16.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 }}
cache: 'npm'
- run: npm ci
- run: npm run test-ci
- run: npm run coverage

- name: Coveralls GitHub Action
uses: coverallsapp/github-action@1.1.3
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ coverage/
defaultlocales
localestowrite
localesmakeplural
/locales_traversal/is/not/possible/en.json
/.nyc_output
20 changes: 0 additions & 20 deletions .travis.yml

This file was deleted.

5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Stores language files in json files compatible to [webtranslateit](http://webtra
Adds new strings on-the-fly when first used in your app.
No extra parsing needed.

[![Travis][travis-image]][travis-url]
![Test](https://github.com/mashpie/i18n-node/actions/workflows/node.js.yml/badge.svg)
[![Test Coverage][coveralls-image]][coveralls-url]
[![NPM version][npm-image]][npm-url]
![npm](https://img.shields.io/npm/dw/i18n)
Expand Down Expand Up @@ -1131,9 +1131,6 @@ For current release notes see [GitHub Release Notes](https://github.com/mashpie/
[npm-image]: https://badge.fury.io/js/i18n.svg
[npm-url]: https://www.npmjs.com/package/i18n

[travis-image]: https://travis-ci.org/mashpie/i18n-node.svg?branch=master
[travis-url]: https://travis-ci.org/mashpie/i18n-node

[coveralls-image]: https://coveralls.io/repos/github/mashpie/i18n-node/badge.svg?branch=master
[coveralls-url]: https://coveralls.io/github/mashpie/i18n-node?branch=master

Expand Down
4 changes: 2 additions & 2 deletions examples/node-http/locales/en.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"Hello World": "Hello World",
"Hello": "Hello"
}
"Hello": "Hello"
}
1 change: 1 addition & 0 deletions locales_traversal/is/not/possible/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
keep me
Loading

0 comments on commit 9683cc6

Please sign in to comment.