From 249c5fa224c40fb774252433c4912fc30864d4fd Mon Sep 17 00:00:00 2001 From: Ivan Goncharov Date: Sun, 14 Jun 2020 00:29:10 +0300 Subject: [PATCH] Cleanup TS integration test --- .github/workflows/ci.yml | 10 +--- integrationTests/integration-test.js | 2 +- integrationTests/ts/package-lock.json | 85 --------------------------- integrationTests/ts/package.json | 5 +- 4 files changed, 4 insertions(+), 98 deletions(-) delete mode 100644 integrationTests/ts/package-lock.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35fb42d70f..43e09762f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,14 +50,8 @@ jobs: with: node-version: ${{ env.NODE_VERSION_USED_FOR_DEVELOPMENT }} - - name: Cache Node.js modules - uses: actions/cache@v2 - with: - path: ~/.npm - key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.OS }}-node- - + # We install bunch of packages during integration tests without locking them + # so we skip cache action to not pollute cache for other jobs. - name: Install Dependencies run: npm ci diff --git a/integrationTests/integration-test.js b/integrationTests/integration-test.js index c64d6570ef..9f1edf2bd6 100644 --- a/integrationTests/integration-test.js +++ b/integrationTests/integration-test.js @@ -24,7 +24,7 @@ describe('Integration Tests', () => { exec(`cp -R ${path.join(__dirname, 'ts')} ${tmpDir}`); const cwd = path.join(tmpDir, 'ts'); - exec('npm ci', { cwd }); + exec('npm i', { cwd }); exec('npm test', { cwd }); }).timeout(40000); }); diff --git a/integrationTests/ts/package-lock.json b/integrationTests/ts/package-lock.json deleted file mode 100644 index 27f52bd580..0000000000 --- a/integrationTests/ts/package-lock.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@types/node": { - "version": "10.12.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz", - "integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==" - }, - "graphql": { - "version": "file:../../npmDist" - }, - "typescript-2.6": { - "version": "npm:typescript@2.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz", - "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=" - }, - "typescript-2.7": { - "version": "npm:typescript@2.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", - "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==" - }, - "typescript-2.8": { - "version": "npm:typescript@2.8.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.8.4.tgz", - "integrity": "sha512-IIU5cN1mR5J3z9jjdESJbnxikTrEz3lzAw/D0Tf45jHpBp55nY31UkUvmVHoffCfKHTqJs3fCLPDxknQTTFegQ==" - }, - "typescript-2.9": { - "version": "npm:typescript@2.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", - "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==" - }, - "typescript-3.0": { - "version": "npm:typescript@3.0.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz", - "integrity": "sha512-kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==" - }, - "typescript-3.1": { - "version": "npm:typescript@3.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz", - "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==" - }, - "typescript-3.2": { - "version": "npm:typescript@3.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz", - "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==" - }, - "typescript-3.3": { - "version": "npm:typescript@3.3.4000", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz", - "integrity": "sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==" - }, - "typescript-3.4": { - "version": "npm:typescript@3.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz", - "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==" - }, - "typescript-3.5": { - "version": "npm:typescript@3.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", - "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==" - }, - "typescript-3.6": { - "version": "npm:typescript@3.6.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.5.tgz", - "integrity": "sha512-BEjlc0Z06ORZKbtcxGrIvvwYs5hAnuo6TKdNFL55frVDlB+na3z5bsLhFaIxmT+dPWgBIjMo6aNnTOgHHmHgiQ==" - }, - "typescript-3.7": { - "version": "npm:typescript@3.7.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz", - "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==" - }, - "typescript-3.8": { - "version": "npm:typescript@3.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", - "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==" - }, - "typescript-3.9": { - "version": "npm:typescript@3.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz", - "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==" - } - } -} diff --git a/integrationTests/ts/package.json b/integrationTests/ts/package.json index f9c970ae26..7ca8db7d52 100644 --- a/integrationTests/ts/package.json +++ b/integrationTests/ts/package.json @@ -1,12 +1,9 @@ { "version": "1.0.0", "scripts": { - "test": "node test.js", - "test-3.8": "tsc test.ts", - "test-3.9": "tsc test.ts" + "test": "node test.js" }, "dependencies": { - "@types/node": "10.12.21", "graphql": "file:../../npmDist", "typescript-2.6": "npm:typescript@2.6.x", "typescript-2.7": "npm:typescript@2.7.x",