diff --git a/.github/workflows/yarn.yml b/.github/workflows/build.yml similarity index 65% rename from .github/workflows/yarn.yml rename to .github/workflows/build.yml index 6dcff1ea7c..134c2b382b 100644 --- a/.github/workflows/yarn.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Yarn build +name: Build on: push: @@ -12,7 +12,7 @@ jobs: strategy: matrix: - node-version: [14.x] + node-version: [16.x, 18.x] steps: - uses: actions/checkout@v2 @@ -24,9 +24,5 @@ jobs: - name: Build run: | - yarn - yarn build - - name: Upload a Build Artifact - uses: actions/upload-artifact@v2.2.4 - with: - path: dist + npm ci + npm run build diff --git a/package-lock.json b/package-lock.json index e2da8e7825..f6a8127ab6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,8 +16,7 @@ "json-stringify-pretty-compact": "^3.0.0", "rimraf": "^4.1.2", "ts-node": "10.9.1", - "typescript": "^4.9.4", - "yarn": "^1.22.0" + "typescript": "^4.9.4" }, "bin": { "via-keyboards": "bin/cli.js" @@ -1231,19 +1230,6 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, - "node_modules/yarn": { - "version": "1.22.19", - "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.19.tgz", - "integrity": "sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ==", - "hasInstallScript": true, - "bin": { - "yarn": "bin/yarn.js", - "yarnpkg": "bin/yarn.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, "node_modules/yn": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", @@ -2211,11 +2197,6 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, - "yarn": { - "version": "1.22.19", - "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.19.tgz", - "integrity": "sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ==" - }, "yn": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", diff --git a/package.json b/package.json index 8d8dd88c23..85108f5ea6 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "json-stringify-pretty-compact": "^3.0.0", "rimraf": "^4.1.2", "ts-node": "10.9.1", - "typescript": "^4.9.4", - "yarn": "^1.22.0" + "typescript": "^4.9.4" } }