From d6ebfacd5548919de0720180a52fe9c08b30076a Mon Sep 17 00:00:00 2001 From: Perryvw Date: Mon, 18 Jul 2022 20:58:20 +0200 Subject: [PATCH] Fix benchmark --- .github/workflows/ci.yml | 26 ++++++++++---- .github/workflows/release.yml | 2 +- package-lock.json | 67 +++++++++++++---------------------- package.json | 2 +- 4 files changed, 46 insertions(+), 51 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8cfb0d49..65a3c2637 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Use Node.js 15.14.0 + - name: Use Node.js 16.14.0 uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -59,16 +59,30 @@ jobs: uses: actions/checkout@v2 with: path: commit - - name: Use Node.js 12.13.1 + - name: Use Node.js 16.14.0 uses: actions/setup-node@v1 with: node-version: 16.14.0 # NPM - - name: NPM master - run: npm ci && npm run build + # install and build master + - name: npm ci master + run: npm ci working-directory: master - - name: NPM commit - run: npm ci && npm run build + - name: Use local tstl language extensions + run: npm i lua-types@latest && npm i -D file:. + working-directory: master + - name: Build master + run: npm run build + working-directory: master + # install and build commit + - name: npm ci commit + run: npm ci + working-directory: commit + - name: Use local tstl language extensions + run: npm i -D file:. + working-directory: commit + - name: Build commit + run: npm run build working-directory: commit # Benchmark directory setup - name: Ensure benchmark data dir exists diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22e242d03..904eae1b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Use Node.js 12.13.1 + - name: Use Node.js 16.14.0 uses: actions/setup-node@v1 with: node-version: 16.14.0 diff --git a/package-lock.json b/package-lock.json index e8b7cb5eb..72ae0649f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "javascript-stringify": "^2.0.1", "jest": "^27.3.0", "jest-circus": "^27.3.0", - "lua-types": "2.10.1", + "lua-types": "^2.11.0", "lua-wasm-bindings": "^0.2.2", "prettier": "^2.3.2", "ts-jest": "^27.1.3", @@ -4803,12 +4803,12 @@ } }, "node_modules/lua-types": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/lua-types/-/lua-types-2.10.1.tgz", - "integrity": "sha512-Ai7L25I5kHZYGN5C3LALUse7Eus0k/kM9tEO2zwReG2Xuker0c+0e2M4iyfiEvlGOmBc7cDouqJ5lFwyg8JqiQ==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/lua-types/-/lua-types-2.11.0.tgz", + "integrity": "sha512-J/8qHrOjkZuPBDhnuAg0DWoaJEImqXNzgEnUigCTVrSVCcchM5Y5zpcI3aWAZPhuZlb0QKC/f3nc7VGmZmBg7w==", "dev": true, - "dependencies": { - "typescript-to-lua": "^0.39.0" + "peerDependencies": { + "typescript-to-lua": "^1.0.0" } }, "node_modules/lua-wasm-bindings": { @@ -6038,34 +6038,24 @@ } }, "node_modules/typescript-to-lua": { - "version": "0.39.6", - "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-0.39.6.tgz", - "integrity": "sha512-Yq+XsmFKknMlz9jm1FvTw5B7R4H8lYUly4uwxlR44aT4OFyG9S7mOImrTIF07j414PdrJSQ5dAAhQOBVRqHbMw==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.6.3.tgz", + "integrity": "sha512-yfXxGjOwX6453wSgEB37lLdxZZ8m+LH1g3PfebNfKaZHGGtbm9owxE6oRKB3sWcy2CICkfobAjWf3VdhKnEETg==", "dev": true, + "peer": true, "dependencies": { + "enhanced-resolve": "^5.8.2", "resolve": "^1.15.1", - "source-map": "^0.7.3", - "typescript": "~4.3.2" + "source-map": "^0.7.3" }, "bin": { "tstl": "dist/tstl.js" }, "engines": { "node": ">=12.13.0" - } - }, - "node_modules/typescript-to-lua/node_modules/typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" }, - "engines": { - "node": ">=4.2.0" + "peerDependencies": { + "typescript": "~4.7.3" } }, "node_modules/unbox-primitive": { @@ -9984,13 +9974,11 @@ } }, "lua-types": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/lua-types/-/lua-types-2.10.1.tgz", - "integrity": "sha512-Ai7L25I5kHZYGN5C3LALUse7Eus0k/kM9tEO2zwReG2Xuker0c+0e2M4iyfiEvlGOmBc7cDouqJ5lFwyg8JqiQ==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/lua-types/-/lua-types-2.11.0.tgz", + "integrity": "sha512-J/8qHrOjkZuPBDhnuAg0DWoaJEImqXNzgEnUigCTVrSVCcchM5Y5zpcI3aWAZPhuZlb0QKC/f3nc7VGmZmBg7w==", "dev": true, - "requires": { - "typescript-to-lua": "^0.39.0" - } + "requires": {} }, "lua-wasm-bindings": { "version": "0.2.2", @@ -10863,22 +10851,15 @@ "dev": true }, "typescript-to-lua": { - "version": "0.39.6", - "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-0.39.6.tgz", - "integrity": "sha512-Yq+XsmFKknMlz9jm1FvTw5B7R4H8lYUly4uwxlR44aT4OFyG9S7mOImrTIF07j414PdrJSQ5dAAhQOBVRqHbMw==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.6.3.tgz", + "integrity": "sha512-yfXxGjOwX6453wSgEB37lLdxZZ8m+LH1g3PfebNfKaZHGGtbm9owxE6oRKB3sWcy2CICkfobAjWf3VdhKnEETg==", "dev": true, + "peer": true, "requires": { + "enhanced-resolve": "^5.8.2", "resolve": "^1.15.1", - "source-map": "^0.7.3", - "typescript": "~4.3.2" - }, - "dependencies": { - "typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", - "dev": true - } + "source-map": "^0.7.3" } }, "unbox-primitive": { diff --git a/package.json b/package.json index f01b5790d..73ee89025 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "javascript-stringify": "^2.0.1", "jest": "^27.3.0", "jest-circus": "^27.3.0", - "lua-types": "2.10.1", + "lua-types": "^2.11.0", "lua-wasm-bindings": "^0.2.2", "prettier": "^2.3.2", "ts-jest": "^27.1.3",