Skip to content
This repository was archived by the owner on Sep 5, 2020. It is now read-only.

Commit c532f2a

Browse files
evertonfragaevertonfraga
authored
Merge pull request #4022 from ethereum/develop
`develop` changes into `master`
2 parents 88b10c4 + c32cb44 commit c532f2a

24 files changed

+489
-743
lines changed

‎.circleci/config.yml

+143
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
#
2+
# TODO: compilation
3+
# TODO: store_artifacts
4+
# TODO: name commands properly
5+
# TODO: mac job
6+
# TODO: improve caching
7+
# TODO: fix `xvfb gulp test` command
8+
# TODO: windows job
9+
# TODO: store_test_results
10+
# TODO: docker images
11+
#
12+
13+
defaults: &defaults
14+
working_directory: /home/circleci/mist
15+
docker:
16+
- image: circleci/node:8.9.4-browsers
17+
environment:
18+
# Setting variable to fix node-gyp build error:
19+
# https://github.com/nodejs/node/issues/7173#issuecomment-224772258
20+
- CXX_host: 'g++ -m32'
21+
22+
linux_dependencies: &linux_dependencies
23+
name: Linux package dependencies
24+
# Installing multilib (build for 32 and 64 architectures):
25+
# https://www.quora.com/How-do-I-fix-fatal-error-sys-cdefs-h-file-not-found-include-sys-cdefs-h
26+
command: |
27+
sudo apt-get update &&
28+
sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils &&
29+
sudo apt-get install graphicsmagick
30+
31+
install_meteor: &install_meteor
32+
name: Installing Meteor
33+
# PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh
34+
command: which meteor || curl https://install.meteor.com | /bin/sh
35+
36+
install_node_modules: &install_node_modules
37+
name: Installing node dependencies using yarn
38+
command: yarn
39+
40+
41+
# Javascript Node CircleCI 2.0 configuration file
42+
#
43+
# Check https://circleci.com/docs/2.0/language-javascript/ for more details
44+
#
45+
version: 2
46+
jobs:
47+
build:
48+
<<: *defaults
49+
steps:
50+
- checkout
51+
52+
# Download and cache dependencies
53+
- restore_cache:
54+
keys:
55+
- v1-dependencies-{{ checksum "package.json" }}
56+
# fallback to using the latest cache if no exact match is found
57+
- v1-dependencies-
58+
59+
# Setting PATH: https://circleci.com/docs/2.0/env-vars/#setting-path
60+
- run: echo 'export PATH=`yarn global bin`:$PATH' >> $BASH_ENV
61+
62+
- run:
63+
<<: *linux_dependencies
64+
- run:
65+
<<: *install_meteor
66+
- run:
67+
<<: *install_node_modules
68+
69+
- save_cache:
70+
paths:
71+
- node_modules
72+
key: v1-dependencies-{{ checksum "package.json" }}
73+
- persist_to_workspace:
74+
root: /home/circleci/
75+
paths:
76+
- mist
77+
78+
mist-linux:
79+
<<: *defaults
80+
steps:
81+
- attach_workspace:
82+
at: /home/circleci/
83+
84+
- run:
85+
<<: *linux_dependencies
86+
- run:
87+
<<: *install_meteor
88+
- run:
89+
<<: *install_node_modules
90+
91+
- run: yarn build:mist --linux
92+
93+
- store_artifacts:
94+
path: dist_mist/release
95+
96+
wallet-linux:
97+
<<: *defaults
98+
steps:
99+
- attach_workspace:
100+
at: /home/circleci/
101+
102+
- run:
103+
<<: *linux_dependencies
104+
- run:
105+
<<: *install_meteor
106+
- run:
107+
<<: *install_node_modules
108+
109+
- run: yarn build:wallet --linux
110+
111+
- store_artifacts:
112+
path: dist_wallet/release
113+
114+
spectron-test:
115+
docker:
116+
- image: circleci/node:8.9.4
117+
steps:
118+
- attach_workspace:
119+
at: /home/circleci/
120+
- run: xvfb-run yarn test:e2e
121+
122+
unit-test:
123+
<<: *defaults
124+
steps:
125+
- attach_workspace:
126+
at: /home/circleci/
127+
- run: << *install_node_modules
128+
- run: yarn test:unit:once
129+
130+
workflows:
131+
version: 2
132+
build_and_test:
133+
jobs:
134+
- build
135+
- mist-linux:
136+
requires:
137+
- build
138+
- wallet-linux:
139+
requires:
140+
- build
141+
- unit-test:
142+
requires:
143+
- build

‎.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* [ ] I've asked for help in the [Mist Gitter](http://gitter.im/ethereum/mist) before filing this issue.
1+
- [ ] I've asked for help in the [Mist Gitter](http://gitter.im/ethereum/mist) before filing this issue.
22

33
<!-- Please fill in these information below: -->
44

‎.github/triage.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
initLabels:
2-
- "Status: Triage"
1+
label: "Status: Triage"

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "dapp-styles"]
22
path = interface/public/dapp-styles
33
url = git://github.com/ethereum/dapp-styles.git
4+
[submodule "meteor-dapp-wallet"]
5+
path = meteor-dapp-wallet
6+
url = https://github.com/ethereum/meteor-dapp-wallet.git

‎.travis.yml

+24-69
Original file line numberDiff line numberDiff line change
@@ -8,105 +8,60 @@ cache:
88

99
sudo: required
1010

11-
branches:
12-
only:
13-
- develop
14-
- master
15-
- /^greenkeeper/.*$/
16-
1711
matrix:
1812
include:
19-
# WINDOWS cross-built from linux
20-
- os: linux
21-
dist: trusty
22-
env:
23-
- GULP_PLATFORM=win
24-
addons:
25-
apt:
26-
packages:
27-
- icnsutils
28-
- graphicsmagick
29-
- xz-utils
30-
- nsis
31-
- g++-multilib
32-
sources:
33-
- mono
34-
before_install:
35-
- sudo dpkg --add-architecture i386 && sudo add-apt-repository ppa:ubuntu-wine/ppa -y
36-
- sudo apt-get update -q
37-
- sudo apt-get install --no-install-recommends -y mono-devel ca-certificates-mono wine1.8
38-
3913
# LINUX
4014
- os: linux
4115
dist: trusty
4216
env:
4317
- GULP_PLATFORM=linux
4418
addons:
19+
artifacts:
20+
paths:
21+
- $( ls dist_{mist,wallet}/release/* | tr "\n" ":" )
4522
apt:
4623
packages:
4724
- icnsutils
4825
- graphicsmagick
4926
- xz-utils
5027
- gcc-multilib
5128
- g++-multilib
52-
29+
before_install:
30+
# prepare integration tests
31+
- export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start
32+
5333
# MAC
5434
- os: osx
55-
osx_image: xcode8.3 # currently xcode8.1+ doesn't support electron-builder macOS code-signing (https://github.com/electron-userland/electron-builder/issues/820#issuecomment-267777060)
35+
osx_image: xcode8.3
5636
env:
5737
- GULP_PLATFORM=mac
38+
addons:
39+
artifacts:
40+
paths:
41+
- $( ls dist_{mist,wallet}/release/* | tr "\n" ":" )
5842
before_install:
59-
- npm install -g yarn # macOS xcode8 image doesn't natively support yarn yet
60-
61-
allow_failures:
62-
- os: osx
63-
64-
fast_finish: true
65-
43+
- npm install -g yarn
6644

6745
install:
68-
- echo $PATH
6946
- PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh
70-
- export PATH=$PATH:`yarn global bin`
71-
- yarn global add gulp-cli meteor-build-client [email protected]
47+
7248
- yarn
7349

74-
script:
75-
# disable macOS code-signing (production certificate) on develop branch
50+
# only code signs when on master
7651
- if [[ $TRAVIS_BRANCH != "master" ]]; then unset CSC_LINK CSC_KEY_PASSWORD; fi
77-
# windows code-signing on master branch
78-
- if [[ $GULP_PLATFORM == "win" && $TRAVIS_BRANCH == "master" ]]; then export CSC_LINK=$CSC_WIN_LINK && CSC_KEY_PASSWORD=$CSC_WIN_KEY_PASSWORD; fi
7952

80-
# unit test
81-
- if [[ $GULP_PLATFORM == "linux" ]]; then yarn test:unit:once; fi
53+
script:
54+
- yarn test:unit:once
8255

83-
# build mist
84-
- if [[ $GULP_PLATFORM == "mac" ]]; then travis_wait 60 gulp --$GULP_PLATFORM; fi # increase timeout for slower mac builds
85-
- if [[ $GULP_PLATFORM != "mac" ]]; then gulp --$GULP_PLATFORM; fi
56+
- yarn build:mist --$GULP_PLATFORM
8657

87-
# assert creation of Mist artifacts
88-
- gulp verify-artifacts --mist --$GULP_PLATFORM
89-
90-
# build wallet if on master branch
91-
- if [[ $TRAVIS_BRANCH == "master" ]]; then travis_wait 60 gulp --wallet --$GULP_PLATFORM; fi
58+
- yarn build:wallet --$GULP_PLATFORM
9259

93-
# assert creation of Wallet artifacts
94-
- if [[ $TRAVIS_BRANCH == "master" ]]; then gulp verify-artifacts --wallet --$GULP_PLATFORM; fi
95-
96-
# prepare integration tests
97-
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi
98-
99-
# currently, tests should run in linux and mac
100-
- if [[ $GULP_PLATFORM != "win" ]]; then gulp test; fi
60+
- yarn test:e2e
10161

10262
after_success:
103-
- if [[ $TRAVIS_BRANCH == "master" ]]; then gulp upload-queue --$GULP_PLATFORM && gulp upload-queue --wallet --$GULP_PLATFORM; fi
104-
63+
- if [[ $TRAVIS_BRANCH == "master" ]]; then
64+
yarn dist:mist --$GULP_PLATFORM;
65+
yarn dist:wallet --$GULP_PLATFORM;
66+
fi
10567

106-
notifications:
107-
webhooks:
108-
urls:
109-
- https://webhooks.gitter.im/e/33972d9e627a142c57a6
110-
on_success: change
111-
on_failure: always
112-
on_start: never

‎CODE_OF_CONDUCT.md

+17-17
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@ If you see someone who is making an extra effort to ensure our community is welc
2020

2121
The following behaviors are expected and requested of all community members:
2222

23-
* Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
24-
* Exercise consideration and respect in your speech and actions.
25-
* Attempt collaboration before conflict.
26-
* Refrain from demeaning, discriminatory, or harassing behavior and speech.
27-
* Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
28-
* Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
23+
- Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
24+
- Exercise consideration and respect in your speech and actions.
25+
- Attempt collaboration before conflict.
26+
- Refrain from demeaning, discriminatory, or harassing behavior and speech.
27+
- Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
28+
- Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
2929

3030
## 4. Unacceptable Behavior
3131

3232
The following behaviors are considered harassment and are unacceptable within our community:
3333

34-
* Violence, threats of violence or violent language directed against another person.
35-
* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
36-
* Posting or displaying sexually explicit or violent material.
37-
* Posting or threatening to post other people’s personally identifying information ("doxing").
38-
* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
39-
* Inappropriate photography or recording.
40-
* Inappropriate physical contact. You should have someone’s consent before touching them.
41-
* Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
42-
* Deliberate intimidation, stalking or following (online or in person).
43-
* Advocating for, or encouraging, any of the above behavior.
44-
* Sustained disruption of community events, including talks and presentations.
34+
- Violence, threats of violence or violent language directed against another person.
35+
- Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
36+
- Posting or displaying sexually explicit or violent material.
37+
- Posting or threatening to post other people’s personally identifying information ("doxing").
38+
- Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
39+
- Inappropriate photography or recording.
40+
- Inappropriate physical contact. You should have someone’s consent before touching them.
41+
- Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
42+
- Deliberate intimidation, stalking or following (online or in person).
43+
- Advocating for, or encouraging, any of the above behavior.
44+
- Sustained disruption of community events, including talks and presentations.
4545

4646
## 5. Consequences of Unacceptable Behavior
4747

‎CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
To help improve Mist (_Ethereum Wallet_), please include the following:
88

9-
* What do you run? (_Binary version from [releases](https://github.com/ethereum/mist/releases) or a development version from the [commandline](https://github.com/ethereum/mist#run-mist)_)
10-
* Which version do you use? (_Check the `VERSION` file in the Mist folder_)
11-
* What OS you're on?
9+
- What do you run? (_Binary version from [releases](https://github.com/ethereum/mist/releases) or a development version from the [commandline](https://github.com/ethereum/mist#run-mist)_)
10+
- Which version do you use? (_Check the `VERSION` file in the Mist folder_)
11+
- What OS you're on?
1212

1313
If applicable:
1414

15-
* Log file (Linux: `~/.config/Mist/logs/all.log`, Windows: `%APPDATA%/Roaming/Mist/logs/all.log`, MacOSX: `~/Library/Application Support/Mist/logs/all.log`)
16-
* Screenshot (for GUI related issues)
15+
- Log file (Linux: `~/.config/Mist/logs/all.log`, Windows: `%APPDATA%/Roaming/Mist/logs/all.log`, MacOSX: `~/Library/Application Support/Mist/logs/all.log`)
16+
- Screenshot (for GUI related issues)
1717

1818
## Pull Requests
1919

0 commit comments

Comments
 (0)