diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fee7067..7daca7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,9 +1,12 @@ name: "Build App" +# on: +# push: +# tags: +# - '*' + on: push: - tags: - - '*' jobs: build: @@ -13,10 +16,12 @@ jobs: matrix: include: - os: ubuntu-20.04 + - os: windows-latest runs-on: ${{ matrix.os }} steps: - name: Install linux dependencies + if: matrix.os =='ubuntu-20.04' run: sudo apt-get install fuse libfuse2 libopengl0 libegl1 libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 - name: Checkout code uses: actions/checkout@v2 @@ -27,6 +32,7 @@ jobs: # run: | # npm version --no-git-tag-version from-git - name: Apply packer patch (upgrade linuxqtdeploy to continuous) + if: matrix.os =='ubuntu-20.04' run: | npm run patch - name: Build application @@ -39,6 +45,7 @@ jobs: env: VERSION: ${{ github.ref_name }} - name: Upload artefact + if: matrix.os =='ubuntu-20.04' uses: actions/upload-artifact@v4 with: name: DeadbrainWallet-${{ github.ref_name }}-x86_64.AppImage diff --git a/deploy/win32/DeadbrainWallet/platforms/.gitkeep b/deploy/win32/DeadbrainWallet/platforms/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/deploy/win32/DeadbrainWallet/qode.json b/deploy/win32/DeadbrainWallet/qode.json new file mode 100644 index 0000000..52367eb --- /dev/null +++ b/deploy/win32/DeadbrainWallet/qode.json @@ -0,0 +1,3 @@ +{ + "distPath": ".\\dist" +} diff --git a/deploy/win32/DeadbrainWallet/styles/.gitkeep b/deploy/win32/DeadbrainWallet/styles/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/package-lock.json b/package-lock.json index 1068715..e2d837f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@nodegui/nodegui": "^0.59.0", - "@nodegui/os-utils": "^1.1.2", + "@nodegui/nodegui": "^0.66.0", "debug": "^4.3.4", "dogecoin-spv": "github:ShibeTechnology/dogecoin-spv-node#v0.6.1", "node-notifier": "^10.0.1", @@ -154,9 +153,9 @@ } }, "node_modules/@nodegui/nodegui": { - "version": "0.59.2", - "resolved": "https://registry.npmjs.org/@nodegui/nodegui/-/nodegui-0.59.2.tgz", - "integrity": "sha512-Flglp/NNHmgL5ZxYxAMaUNvW3rDd/VJVYiMlRY2MZEF0MCxKHVCGo2WdkHIPIi97G47AuGvCauZpXRRK5e1BzA==", + "version": "0.66.0", + "resolved": "https://registry.npmjs.org/@nodegui/nodegui/-/nodegui-0.66.0.tgz", + "integrity": "sha512-pzKTrflIuLKETZMs1sJX+32bQwdR9wBUsuBhWsSzzTXdmKvPSUT2LM9TJQdnHkEE59PHX52B0oNGqB7pZW9llQ==", "hasInstallScript": true, "dependencies": { "@nodegui/artifact-installer": "^1.1.0", @@ -181,37 +180,6 @@ "url": "https://github.com/sponsors/a7ul" } }, - "node_modules/@nodegui/os-utils": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@nodegui/os-utils/-/os-utils-1.1.2.tgz", - "integrity": "sha512-z7OApHqDBOsnHOStfZ8pcMIkJuorU34w0pQXtLUM2snI/SAr4t0n5m+nnjYRH227KDuOytaydZrQm+EOYUc7Bg==", - "hasInstallScript": true, - "dependencies": { - "cmake-js": "^6.0.0", - "cross-env": "^6.0.0", - "node-addon-api": "^1.7.1" - } - }, - "node_modules/@nodegui/os-utils/node_modules/cross-env": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz", - "integrity": "sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==", - "dependencies": { - "cross-spawn": "^7.0.0" - }, - "bin": { - "cross-env": "src/bin/cross-env.js", - "cross-env-shell": "src/bin/cross-env-shell.js" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/@nodegui/os-utils/node_modules/node-addon-api": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", - "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==" - }, "node_modules/@nodegui/packer": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@nodegui/packer/-/packer-1.5.0.tgz", diff --git a/package.json b/package.json index 872fbb5..273e8c8 100644 --- a/package.json +++ b/package.json @@ -6,15 +6,14 @@ "scripts": { "start": "qode --inspect src/main.js", "build": "webpack --config webpack.config.js", - "package": "rm -rf deploy/linux/build/ && nodegui-packer --pack dist", + "package": "nodegui-packer --pack dist", "patch": "cd node_modules/@nodegui/packer && patch scripts/setupBinaries.js ../../../nodegui-packer.patch && rm deps/linuxdeployqt && npm run postinstall", "test": "echo \"No test. Only talent. \" && exit 0" }, "author": "", "license": "ISC", "dependencies": { - "@nodegui/nodegui": "^0.59.0", - "@nodegui/os-utils": "^1.1.2", + "@nodegui/nodegui": "^0.66.0", "debug": "^4.3.4", "dogecoin-spv": "github:ShibeTechnology/dogecoin-spv-node#v0.6.1", "node-notifier": "^10.0.1", diff --git a/webpack.config.js b/webpack.config.js index f400c8a..9d575fa 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -22,7 +22,8 @@ module.exports = { patterns: [ { from: 'assets', to: 'assets' }, // the prebuilds for leveldb and secp256k1 - { from: 'node_modules/leveldown/prebuilds/linux-x64/', to: 'prebuilds/linux-x64/'} + { from: 'node_modules/leveldown/prebuilds/linux-x64/', to: 'prebuilds/linux-x64/'}, + { from: 'node_modules/leveldown/prebuilds/win32-x64/', to: 'prebuilds/win32-x64/'} ], }), ],