diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 194dcc0d444726297d94d7dd6170e224daad7084..2bb3df5296da2d5067f3290e76754b65b7fbda07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ test:generate: paths: - output/ -test:tsc: +test:compile-generated: stage: test-generated extends: .nodejs needs: diff --git a/package.json b/package.json index 32ac4723b968c5468d6f98c9f90375170f6b7aeb..6659d1434510a161c5bcb70e3a1c63ebbdd7f753 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "build": "tsc -p tsconfig.lib.json", "lint": "eslint --fix '{src,tests}/**/*.{js,ts}' --quiet --fix", "test": "jest", - "test:compile-generated": "tsc --project tsconfig.ci.json --pretty --noEmit", - "test:lint": "eslint '{src,tests}/**/*.{js,ts}'" + "test:lint": "eslint '{src,tests}/**/*.{js,ts}'", + "test:compile-generated": "cd tests/Fixtures && npm install && tsc --pretty" }, "repository": { "type": "git", diff --git a/tests/Fixtures/.gitignore b/tests/Fixtures/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..d7ff83d3f7ee4765126f9ddf67476b75b9852199 --- /dev/null +++ b/tests/Fixtures/.gitignore @@ -0,0 +1,4 @@ +/package-lock.json +/node_modules +/models +/var diff --git a/tests/Fixtures/package.json b/tests/Fixtures/package.json new file mode 100644 index 0000000000000000000000000000000000000000..1e5be86a2da57926b7722940d235bbef56d36d74 --- /dev/null +++ b/tests/Fixtures/package.json @@ -0,0 +1,6 @@ +{ + "name": "ng-model-generator-test", + "dependencies": { + "irstea-ng-model": "file:../.." + } +} diff --git a/tests/Fixtures/tsconfig.json b/tests/Fixtures/tsconfig.json new file mode 100644 index 0000000000000000000000000000000000000000..eb934eab4a8a929fcb0530d935c3ad3aef3d5a10 --- /dev/null +++ b/tests/Fixtures/tsconfig.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + + "extends": "@tsconfig/node10/tsconfig.json", + + "compileOnSave": false, + "compilerOptions": { + "noEmit": true, + "rootDir": "./models" + }, + + "include": ["models/**/*.ts"], + "exclude": ["node_modules"] +} diff --git a/tsconfig.ci.json b/tsconfig.ci.json deleted file mode 100644 index 264fd474ee9f343ef74cfad843e4a7f5c32f82b9..0000000000000000000000000000000000000000 --- a/tsconfig.ci.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - - "extends": "./tsconfig.json", - - "include": ["src/ts/**/*.ts", "output/**/*.ts"], - "exclude": ["node_modules", "**/*.spec.ts"] -}