diff --git a/.github/workflows/buildMac.yml b/.github/workflows/buildMac.yml index a0e1054e..0c7d1014 100644 --- a/.github/workflows/buildMac.yml +++ b/.github/workflows/buildMac.yml @@ -22,8 +22,6 @@ jobs: toolchain: nightly-2020-08-28 components: clippy override: true - - name: install rustfmt - run: rustup component add rustfmt - name: install dependencies run: npm install - name: pull tor binary diff --git a/.github/workflows/buildWin.yml b/.github/workflows/buildWin.yml index f66df2b6..65b321ea 100644 --- a/.github/workflows/buildWin.yml +++ b/.github/workflows/buildWin.yml @@ -28,12 +28,6 @@ jobs: - name: pull tor binary shell: bash run: curl https://zbay-binaries.s3.us-east-2.amazonaws.com/win32/tor.exe --output ./tor/tor.exe - - name: download rust - shell: bash - run: curl https://static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe --output ./rustup-init.exe - - name: install rust - shell: bash - run: ./rustup-init.exe -y - name: build on Windows shell: bash run: npm run build:prod diff --git a/.github/workflows/sentryBuildMac.yml b/.github/workflows/sentryBuildMac.yml index ff113c12..cb57dbc8 100644 --- a/.github/workflows/sentryBuildMac.yml +++ b/.github/workflows/sentryBuildMac.yml @@ -22,8 +22,6 @@ jobs: toolchain: nightly-2020-08-28 components: clippy override: true - - name: install rustfmt - run: rustup component add rustfmt - name: install dependencies run: npm install - name: pull tor binary diff --git a/.github/workflows/sentryBuildWin.yml b/.github/workflows/sentryBuildWin.yml index 996889e5..4d994912 100644 --- a/.github/workflows/sentryBuildWin.yml +++ b/.github/workflows/sentryBuildWin.yml @@ -28,12 +28,6 @@ jobs: - name: pull tor binary shell: bash run: curl https://zbay-binaries.s3.us-east-2.amazonaws.com/win32/tor.exe --output ./tor/tor.exe - - name: download rust - shell: bash - run: curl https://static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe --output ./rustup-init.exe - - name: install rust - shell: bash - run: ./rustup-init.exe -y - name: build on Windows shell: bash run: npm run build:prod diff --git a/package.json b/package.json index 270f0f86..074f2e33 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,6 @@ "distUbuntu": "export SOURCE_PATH=linux && npm run pullBinaries && npm run pullLibs && npm run build:prod && electron-builder --linux", "distwin": "export SOURCE_PATH=win32 && npm run pullBinariesWin && npm run build:prod && electron-builder --win", "lint": "eslint --ext .jsx,.js,.ts,.tsx ./src/", - "lint-fix": "eslint --fix --ext .jsx,.js,.ts,.tsx ./src/", "type-check": "tsc --noEmit", "test": "jest", "test:watch": "jest --watchAll", @@ -87,13 +86,6 @@ "start-testnet": "ZBAY_IS_TESTNET=1 npm run start:renderer", "start:main": "cross-env NODE_ENV=development electron .", "start:renderer": "cross-env NODE_ENV=development webpack-dev-server --config webpack/webpack.config.renderer.dev.js", - "mainnet": "docker-compose up znode-mainnet", - "testnet": "docker-compose up znode-testnet", - "neon": "electron-build-env neon build --release && npm run copyBinary", - "neonWin": "electron-build-env neon build --release && npm run copyBinaryWin", - "copyBinary": "cp native/index.node worker", - "copyBinaryWin": "move native\\index.node worker", - "neon-rebuild": "rm native/index.node && rm -rf native/target && rm native/Cargo.lock && npm run neon", "storybook": "start-storybook -p 6006", "build-storybook": "build-storybook", "start:e2e": "npm run build:prod && cross-env E2E_TEST=true NODE_ENV=development DEBUG='waggle*,zbay*,testcafe:*electron*' testcafe --color --hostname localhost -S --screenshots-full-page -p '${DATE}_${TIME}_${TEST_ID}.png' \"electron:.\" \"./**/*.e2e.ts\"",