Skip to content

Commit

Permalink
Merge pull request NationalBankBelgium#51 from SuperITMan/feature/upd…
Browse files Browse the repository at this point in the history
…ate-devDeps-and-CI

Feature/update dev deps and ci
  • Loading branch information
mhenkens authored Sep 5, 2024
2 parents 895e299 + 0e567fc commit 0612244
Show file tree
Hide file tree
Showing 7 changed files with 6,355 additions and 4,754 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ charset = utf-8
[*.bat]
end_of_line = crlf

[**.{css, pcss, scss, json, sh, yml}]
[**.{css,pcss,scss,json,sh,yml}]
indent_style = space
indent_size = 2

Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
branches:
- master
- 1.[0-9]+.x

env:
TZ: "Europe/Brussels"
MAIN_NODEJS: "18"
Expand All @@ -26,11 +26,11 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node_version: [ "18" ]
os: [ ubuntu-latest ]
experimental: [ false ]
node_version: ["18"]
os: [ubuntu-latest]
experimental: [false]
# Mark following configurations as "experimental" and allow to continue in case of error
# See documentation: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-including-new-combinations
# See documentation: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-including-new-combinations
include:
- os: macos-latest
node_version: 18
Expand All @@ -47,29 +47,29 @@ jobs:
fi
# See: https://github.com/marketplace/actions/checkout
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# See: https://github.com/marketplace/actions/setup-node-js-environment
- name: Use Node.js ${{ matrix.node_version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node_version }}

# See: https://github.com/marketplace/actions/cache
# See doc: https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows
- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules-${{ matrix.node_version }}-${{ matrix.os }}
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
# npm cache files are stored in `~/.npm` on Linux
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Install npm ${{ env.NPM_VERSION }}
run: npm i -g npm@${{ env.NPM_VERSION }}

Expand Down Expand Up @@ -101,23 +101,22 @@ jobs:
# npm run test:ci:all // comand remove due to incomability node18 and angular12
npm run test:ci
npm run test:ci:demo:ng-latest
- name: Generate docs coverage
run: npm run docs:coverage
if: env.IS_MAIN_ENVIRONMENT == 1

# See: https://github.com/marketplace/actions/upload-artifact
# See: https://github.com/marketplace/actions/upload-a-build-artifact
- name: Upload ngx-form-errors dist folder
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ngx-form-errors-dist
path: dist
if: env.IS_MAIN_ENVIRONMENT == 1

# See: https://github.com/marketplace/actions/coveralls-github-action
- name: Coveralls
uses: coverallsapp/github-action@master
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: "reports/coverage/lcov.info"
Expand All @@ -130,18 +129,19 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
steps:
# See: https://github.com/marketplace/actions/checkout
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# See: https://github.com/marketplace/actions/setup-node-js-environment
- name: Use Node.js ${{ env.MAIN_NODEJS }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ env.MAIN_NODEJS }}

- name: Install npm ${{ env.NPM_VERSION }}
run: npm i -g npm@${{ env.NPM_VERSION }}

- uses: actions/download-artifact@v2
# See: https://github.com/marketplace/actions/download-a-build-artifact
- uses: actions/download-artifact@v4
with:
name: ngx-form-errors-dist
path: dist
Expand Down
5 changes: 1 addition & 4 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

./node_modules/.bin/commitlint --edit $1
commitlint --edit $1
5 changes: 1 addition & 4 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

./node_modules/.bin/lint-staged && npm run docs:coverage
lint-staged && npm run docs:coverage
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.angular/
.git/
.github/
.idea/
.vscode/
dist/
Expand Down
Loading

0 comments on commit 0612244

Please sign in to comment.