Skip to content

Commit 4870cfc

Browse files
committed
Merge branch 'main' into 1418-plugins-as-params
Signed-off-by: Juan Munoz <[email protected]>
2 parents f5b116b + 24f4b25 commit 4870cfc

File tree

272 files changed

+50549
-27461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+50549
-27461
lines changed

.github/workflows/build-and-deploy.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020

2121
- name: Install and Build OpenSCD
2222
run: |
23+
npm i @nx/nx-linux-x64-gnu
2324
npm clean-install
2425
npm run-script build
2526
npm run-script doc
@@ -36,6 +37,6 @@ jobs:
3637
uses: JamesIves/[email protected]
3738
with:
3839
branch: master
39-
folder: packages/open-scd/build
40+
folder: packages/distribution/build
4041
repository-name: openscd/openscd.github.io
4142
ssh-key: ${{ secrets.DEPLOY_KEY }}

.github/workflows/test-and-build.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ jobs:
1313
with:
1414
node-version: "18.x"
1515

16-
- name: Install and Build OpenSCD
16+
- name: Install and Test OpenSCD
1717
run: |
18+
npm i @nx/nx-linux-x64-gnu
1819
npm clean-install
19-
npm run-script build
20+
npm run-script test

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ on:
44
branches-ignore:
55
- main
66
paths:
7-
- packages/open-scd/**
8-
- packages/plugins/**
7+
- packages/**
98

109
jobs:
1110
test:
@@ -21,5 +20,6 @@ jobs:
2120

2221
- name: Install and Test
2322
run: |
23+
npm i @nx/nx-linux-x64-gnu
2424
npm clean-install
2525
npm run-script test

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ node_modules/
2121
/.rollup.cache
2222

2323
# lerna
24-
/lerna-debug.log
24+
/lerna-debug.log
25+
26+
.nx/cache

nx.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717
},
1818
"test": {
1919
"inputs": ["default", "^default"],
20-
"dependsOn": ["^test"]
20+
"dependsOn": ["^test", "build"]
2121
},
2222
"build": {
2323
"dependsOn": ["clean", "^clean", "^build"]
2424
}
25-
}
25+
},
26+
"$schema": "./node_modules/nx/schemas/nx-schema.json",
27+
"defaultBase": "main"
2628
}

0 commit comments

Comments
 (0)