Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
Max J. Polster committed Mar 19, 2024
2 parents a47252e + c41417d commit 6e8f80b
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 24 deletions.
25 changes: 14 additions & 11 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,19 @@ on:
branches: release

jobs:
build:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
id-token: write
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 18
registry-url: https://registry.npmjs.org/
scope: netatwork
- run: npm ci
- run: npm publish --access=public --@netatwork:registry=https://registry.npmjs.org/
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20
registry-url: https://registry.npmjs.org/
scope: netatwork
- run: npm ci
- run: npm publish --provenance --access=public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
22 changes: 13 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
name: Test

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

jobs:
build:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 18
- run: |
npm ci
npm test
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20
registry-url: https://registry.npmjs.org/
- run: npm ci
- run: npm test
4 changes: 2 additions & 2 deletions package-lock.json

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

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"name": "@netatwork/aurelia-i18n-tools",
"version": "4.1.0",
"version": "4.1.1",
"description": "A toolchain to help with localization in aurelia projects.",
"repository": {
"type": "git",
"url": "https://github.com/Netatwork-de/aurelia-i18n-tools"
},
"type": "module",
"main": "./dist/index.js",
"bin": {
Expand Down Expand Up @@ -31,7 +35,6 @@
"concurrently": "^8.2.2",
"typescript": "^5.4.2"
},
"repository": "github:Netatwork-de/aurelia-i18n-tools",
"author": "Net at Work GmbH",
"license": "Apache-2.0"
}

0 comments on commit 6e8f80b

Please sign in to comment.