Skip to content
This repository has been archived by the owner on Jul 15, 2023. It is now read-only.

Commit

Permalink
VUnit, OSVVM, linter interface support
Browse files Browse the repository at this point in the history
  • Loading branch information
qarlosalberto committed Jan 11, 2023
1 parent 9761a62 commit 2caeaeb
Show file tree
Hide file tree
Showing 43 changed files with 2,375 additions and 556 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ jobs:
steps:
- run: apt update
- run: apt install -y nsis p7zip-full p7zip-rar git curl tar xz-utils apt-utils
- run: git config --global --add safe.directory /__w/colibri2/colibri2
- run: git config --global --add safe.directory /__w/colibri/colibri
- uses: actions/setup-node@v2
with:
node-version: "16"
Expand Down Expand Up @@ -228,9 +228,9 @@ jobs:
- name: Tar for release
run: |
cd ..
tar -cvzf teroshdl2-${{ steps.publish.outputs.version }}.tar.gz colibri2
mv teroshdl2-${{ steps.publish.outputs.version }}.tar.gz colibri2
cd colibri2
tar -cvzf teroshdl2-${{ steps.publish.outputs.version }}.tar.gz colibri
mv teroshdl2-${{ steps.publish.outputs.version }}.tar.gz colibri
cd colibri
- name: Download artifacts pack
uses: actions/download-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions copy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ python3 generate_web.py
cd ../../../

npm install
rm -rf ../vscode-terosHDL2/node_modules/teroshdl2/out/
cp -R out ../vscode-terosHDL2/node_modules/teroshdl2/
rm -rf ../vscode-terosHDL/node_modules/teroshdl2/out/
cp -R out ../vscode-terosHDL/node_modules/teroshdl2/
14 changes: 10 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "colibri2",
"author": "Carlos Alberto Ruiz Naranjo <[email protected]>, Ismael Perez Rojo <[email protected] >",
"homepage": "https://terostechnology.github.io",
"version": "1.6.0",
"version": "1.8.3",
"description": "TerosHDL backend",
"main": "out/index.js",
"oclif": {
Expand Down Expand Up @@ -40,9 +40,12 @@
"copy-dependency": "shx cp -R ./src/project_manager/dependency/*.py ./out/project_manager/dependency",
"copy-templates": "shx cp -R ./src/template/helpers ./out/template",
"copy-reporter": "shx cp -R ./src/reporter/html_detailed_formatter/helpers ./out/reporter/html_detailed_formatter",
"copy-files": "npm run copy-parser && npm run copy-dependency && npm run copy-templates && npm run copy-reporter && npm run copy-documenter",
"copy-project-manager-edalize": "shx cp -R ./src/project_manager/tool/edalize ./out/project_manager/tool",
"copy-project-manager-vunit": "shx cp -R ./src/project_manager/tool/vunit ./out/project_manager/tool",
"copy-project-manager-loaders": "shx cp -R ./src/project_manager/prj_loaders/ ./out/project_manager/",
"copy-files": "npm run copy-parser && npm run copy-dependency && npm run copy-templates && npm run copy-reporter && npm run copy-documenter && npm run copy-project-manager-edalize && npm run copy-project-manager-vunit && npm run copy-project-manager-loaders",
"lint": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' eslint . --quiet --ext .ts",
"test": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha --colors --exlude tests/linter/linter.spec.ts --reporter mocha-multi-reporters --reporter-options configFile=config.json -r ts-node/register 'tests/**/*.ts'"
"test": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha --colors --exlude tests/linter/linter.spec.ts --reporter mocha-multi-reporters --reporter-options configFile=config.json -r ts-node/register 'tests/**/*.ts' --exit"
},
"directories": {
"lib": "./lib",
Expand All @@ -60,6 +63,7 @@
"clone": "^2.1.2",
"console-table-printer": "^2.11.0",
"fast-xml-parser": "4.0.10",
"js-yaml": "^4.1.0",
"json5": "2.1.3",
"lodash": "^4.17.21",
"nunjucks": "^3.2.0",
Expand All @@ -72,14 +76,16 @@
"temp": "0.9.4",
"tiny-glob": "^0.2.9",
"wavedrom": "2.6.8",
"web-tree-sitter": "^0.16.2"
"web-tree-sitter": "^0.16.2",
"chokidar": "3.5.3"
},
"devDependencies": {
"@oclif/test": "^2",
"@types/assert": "^1.5.6",
"@types/chai": "^4",
"@types/cli-color": "^2.0.2",
"@types/expect": "^24.3.0",
"@types/js-yaml": "^4.0.5",
"@types/mocha": "^9.1.1",
"@typescript-eslint/eslint-plugin": "^5.27.0",
"@typescript-eslint/parser": "^5.27.0",
Expand Down
Loading

0 comments on commit 2caeaeb

Please sign in to comment.