Skip to content

Commit

Permalink
Merge branch 'main' into 1418-plugins-as-params
Browse files Browse the repository at this point in the history
Signed-off-by: Juan Munoz <juancho0202@gmail.com>
  • Loading branch information
juancho0202 committed May 6, 2024
2 parents f5b116b + 24f4b25 commit 476445c
Show file tree
Hide file tree
Showing 272 changed files with 50,556 additions and 27,466 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:

- name: Install and Build OpenSCD
run: |
npm i @nx/nx-linux-x64-gnu
npm clean-install
npm run-script build
npm run-script doc
Expand All @@ -36,6 +37,6 @@ jobs:
uses: JamesIves/github-pages-deploy-action@4.1.5
with:
branch: master
folder: packages/open-scd/build
folder: packages/distribution/build
repository-name: openscd/openscd.github.io
ssh-key: ${{ secrets.DEPLOY_KEY }}
5 changes: 3 additions & 2 deletions .github/workflows/test-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ jobs:
with:
node-version: "18.x"

- name: Install and Build OpenSCD
- name: Install and Test OpenSCD
run: |
npm i @nx/nx-linux-x64-gnu
npm clean-install
npm run-script build
npm run-script test
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ on:
branches-ignore:
- main
paths:
- packages/open-scd/**
- packages/plugins/**
- packages/**

jobs:
test:
Expand All @@ -21,5 +20,6 @@ jobs:

- name: Install and Test
run: |
npm i @nx/nx-linux-x64-gnu
npm clean-install
npm run-script test
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ node_modules/
/.rollup.cache

# lerna
/lerna-debug.log
/lerna-debug.log

.nx/cache
6 changes: 4 additions & 2 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
},
"test": {
"inputs": ["default", "^default"],
"dependsOn": ["^test"]
"dependsOn": ["^test", "build"]
},
"build": {
"dependsOn": ["clean", "^clean", "^build"]
}
}
},
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"defaultBase": "main"
}
Loading

0 comments on commit 476445c

Please sign in to comment.