diff --git a/.github/workflows/build-app-beta.yaml b/.github/workflows/build-app-beta.yaml index 73f74c5b2..223b5f649 100644 --- a/.github/workflows/build-app-beta.yaml +++ b/.github/workflows/build-app-beta.yaml @@ -27,6 +27,9 @@ jobs: uses: actions/setup-node@v1 with: node-version: 14.x + - name: yarn adjustPackageJson + run: | + yarn adjustPackageJson - name: yarn install run: | yarn install diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml index 5ced4e700..b37334d0e 100644 --- a/.github/workflows/build-app.yaml +++ b/.github/workflows/build-app.yaml @@ -31,6 +31,9 @@ jobs: uses: actions/setup-node@v1 with: node-version: 14.x + - name: yarn adjustPackageJson + run: | + yarn adjustPackageJson - name: yarn install run: | # yarn --version diff --git a/adjustPackageJson.js b/adjustPackageJson.js new file mode 100644 index 000000000..baa2620f5 --- /dev/null +++ b/adjustPackageJson.js @@ -0,0 +1,12 @@ +const fs = require('fs'); + +function adjustFile(file) { + const json = JSON.parse(fs.readFileSync(file, { encoding: 'utf-8' })); + if (process.platform != 'win32') { + delete json.optionalDependencies.msnodesqlv8; + } + fs.writeFileSync(file, JSON.stringify(json, null, 2), 'utf-8'); +} + +adjustFile('package.json'); +adjustFile('app/package.json'); diff --git a/package.json b/package.json index acc672e0a..d5a2e4157 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "start:app:local": "cd app && yarn start:local", "setCurrentVersion": "node setCurrentVersion", "generatePadFile": "node generatePadFile", + "adjustPackageJson": "node adjustPackageJson", "fillNativeModules": "node fillNativeModules", "fillNativeModulesElectron": "node fillNativeModules --electron", "fillPackagedPlugins": "node fillPackagedPlugins",