Skip to content
This repository has been archived by the owner on Mar 23, 2023. It is now read-only.

Commit

Permalink
Merge pull request #1690 from ArkEcosystem/develop
Browse files Browse the repository at this point in the history
release: 2.8.1
  • Loading branch information
alexbarnsley committed Feb 21, 2020
2 parents 32b987c + 59b5592 commit 719337d
Show file tree
Hide file tree
Showing 95 changed files with 2,296 additions and 1,989 deletions.
1 change: 1 addition & 0 deletions .electron-vue/dev-runner.js
Expand Up @@ -41,6 +41,7 @@ function logStats (proc, data) {
function startRenderer () {
return new Promise((resolve, reject) => {
rendererConfig.entry.renderer = [path.join(__dirname, 'dev-client')].concat(rendererConfig.entry.renderer)
rendererConfig.entry.splashscreen = [path.join(__dirname, 'dev-client')].concat(rendererConfig.entry.splashscreen)
rendererConfig.mode = 'development'
const compiler = webpack(rendererConfig)
hotMiddleware = webpackHotMiddleware(compiler, {
Expand Down
18 changes: 17 additions & 1 deletion .electron-vue/webpack.renderer.config.js
Expand Up @@ -26,7 +26,8 @@ let whiteListedModules = ['vue', 'portal-vue', '@arkecosystem/client', 'got', '@
let rendererConfig = {
devtool: '#cheap-module-eval-source-map',
entry: {
renderer: path.join(__dirname, '../src/renderer/main.js')
renderer: path.join(__dirname, '../src/renderer/main.js'),
splashscreen: path.join(__dirname, '../src/renderer/splashscreen.js')
},
externals: [
...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d))
Expand Down Expand Up @@ -86,6 +87,7 @@ let rendererConfig = {
use: {
loader: 'url-loader',
query: {
esModule: false,
limit: 10000,
name: 'imgs/[name]--[folder].[ext]'
}
Expand Down Expand Up @@ -142,6 +144,20 @@ let rendererConfig = {
new HtmlWebpackPlugin({
filename: 'index.html',
template: path.resolve(__dirname, '../src/index.ejs'),
inject: false,
minify: {
collapseWhitespace: true,
removeAttributeQuotes: true,
removeComments: true
},
nodeModules: process.env.NODE_ENV !== 'production'
? path.resolve(__dirname, '../node_modules')
: false
}),
new HtmlWebpackPlugin({
filename: 'splashscreen.html',
template: path.resolve(__dirname, '../src/splashscreen.ejs'),
inject: false,
minify: {
collapseWhitespace: true,
removeAttributeQuotes: true,
Expand Down
171 changes: 171 additions & 0 deletions .github/workflows/release.yml
@@ -0,0 +1,171 @@
name: Draft Release

on:
push:
branches:
- "master"

jobs:
# create-release:
# runs-on: ubuntu-latest

# steps:
# - name: Checkout code
# uses: actions/checkout@v2

# - name: Determine the release version
# id: derive_release_version
# run: |
# RELEASE_VERSION=$(cat package.json | jq -r '.version')
# echo "::set-output name=version::${RELEASE_VERSION}"

# - name: Create Release
# id: create_release
# uses: actions/create-release@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# tag_name: ${{ steps.derive_release_version.outputs.version }}
# release_name: Version ${{ steps.derive_release_version.outputs.version }}
# draft: true
# prerelease: false

publish-linux:
# needs: ["create-release"]

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [12.x]

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Cache node modules
uses: actions/cache@v1
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-node-

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Update System
run: sudo apt-get update

- name: Ledger
run: sudo apt-get install libudev-dev libusb-1.0-0-dev

- name: Install
run: yarn global add node-gyp && yarn install --frozen-lockfile

- name: Re-build bcrypto
run: cd node_modules/bcrypto && npm install && cd ../../

- name: Build & Publish
run: yarn build:linux:publish
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Calculate Checksums for AppImage
run: shasum -a 256 build/target/ark-desktop-wallet-linux-x86_64-2.8.1.AppImage

- name: Calculate Checksums for TAR
run: shasum -a 256 build/target/ark-desktop-wallet-linux-x64-2.8.1.tar.gz

- name: Calculate Checksums for DEB
run: shasum -a 256 build/target/ark-desktop-wallet-linux-amd64-2.8.1.deb

publish-macos:
# needs: ["create-release"]

runs-on: macos-latest

strategy:
matrix:
node-version: [12.x]

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Cache node modules
uses: actions/cache@v1
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-node-

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install
run: yarn global add node-gyp && yarn install --frozen-lockfile

- name: Prepare for app notarization
run: |
mkdir -p ~/private_keys/
echo '${{ secrets.APPLE_API_KEY }}' > ~/private_keys/AuthKey_${{ secrets.APPLE_API_KEY_ID }}.p8
- name: Build & Publish
run: yarn build:mac:publish
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
APPLE_API_KEY_ISSUER_ID: ${{ secrets.APPLE_API_KEY_ISSUER_ID }}
CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}

- name: Calculate Checksums for DMG
run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.8.1.dmg

- name: Calculate Checksums for ZIP
run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.8.1.zip

publish-windows:
# needs: ["create-release"]

runs-on: windows-latest

strategy:
matrix:
node-version: [12.x]

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Cache node modules
uses: actions/cache@v1
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-node-

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install
run: yarn global add node-gyp && yarn install --frozen-lockfile
shell: cmd

- name: Build & Publish
run: yarn build:win:publish
shell: cmd
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}

- name: Calculate Checksums for EXE
run: Get-FileHash build/target/ark-desktop-wallet-win-2.8.1.exe -Algorithm SHA256 | Format-List
shell: powershell
39 changes: 26 additions & 13 deletions .github/workflows/test.yml
Expand Up @@ -89,23 +89,23 @@ jobs:
# - name: Upload .AppImage
# uses: actions/upload-artifact@master
# with:
# name: ark-desktop-wallet-linux-2.8.0.AppImage
# path: build/target/ark-desktop-wallet-linux-x86_64-2.8.0.AppImage
# name: ark-desktop-wallet-linux-2.8.1.AppImage
# path: build/target/ark-desktop-wallet-linux-x86_64-2.8.1.AppImage

# - name: Upload .tar.gz
# uses: actions/upload-artifact@master
# with:
# name: ark-desktop-wallet-linux-2.8.0.tar.gz
# path: build/target/ark-desktop-wallet-linux-x64-2.8.0.tar.gz
# name: ark-desktop-wallet-linux-2.8.1.tar.gz
# path: build/target/ark-desktop-wallet-linux-x64-2.8.1.tar.gz

- name: Upload .deb
uses: actions/upload-artifact@master
with:
name: ark-desktop-wallet-linux-2.8.0.deb
path: build/target/ark-desktop-wallet-linux-amd64-2.8.0.deb
name: ark-desktop-wallet-linux-2.8.1-${{ github.sha }}.deb
path: build/target/ark-desktop-wallet-linux-amd64-2.8.1.deb

build-macOS:
runs-on: macOS-latest
runs-on: macos-latest

strategy:
matrix:
Expand All @@ -129,20 +129,30 @@ jobs:
- name: Install
run: yarn global add node-gyp && yarn install --frozen-lockfile

- name: Prepare for app notarization
run: |
mkdir -p ~/private_keys/
echo '${{ secrets.APPLE_API_KEY }}' > ~/private_keys/AuthKey_${{ secrets.APPLE_API_KEY_ID }}.p8
- name: Build
run: yarn build:mac
env:
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
APPLE_API_KEY_ISSUER_ID: ${{ secrets.APPLE_API_KEY_ISSUER_ID }}
CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}

# - name: Upload .zip
# uses: actions/upload-artifact@master
# with:
# name: ark-desktop-wallet-mac-2.8.0.zip
# path: build/target/ark-desktop-wallet-mac-2.8.0.zip
# name: ark-desktop-wallet-mac-2.8.1.zip
# path: build/target/ark-desktop-wallet-mac-2.8.1.zip

- name: Upload .dmg
uses: actions/upload-artifact@v1
with:
name: ark-desktop-wallet-mac-2.8.0.dmg
path: build/target/ark-desktop-wallet-mac-2.8.0.dmg
name: ark-desktop-wallet-mac-2.8.1-${{ github.sha }}.dmg
path: build/target/ark-desktop-wallet-mac-2.8.1.dmg

build-windows:
runs-on: windows-latest
Expand All @@ -166,9 +176,12 @@ jobs:
- name: Build
run: yarn build:win
shell: cmd
env:
CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}

- name: Upload .exe
uses: actions/upload-artifact@v1
with:
name: ark-desktop-wallet-win-2.8.0.exe
path: build/target/ark-desktop-wallet-win-2.8.0.exe
name: ark-desktop-wallet-win-2.8.1-${{ github.sha }}.exe
path: build/target/ark-desktop-wallet-win-2.8.1.exe
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -21,3 +21,5 @@ yarn-error.log
__tests__/*/.coverage

plugins/*

!build/entitlements.mac.plist
44 changes: 0 additions & 44 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
@@ -1 +1 @@
* @faustbrian @alexbarnsley @luciorubeens @j-a-m-l @ItsANameToo
* @faustbrian @alexbarnsley @luciorubeens @ItsANameToo

0 comments on commit 719337d

Please sign in to comment.