Skip to content

Commit fb9e9d3

Browse files
authored
Merge pull request #345 from simelo/stdevMac_t344_add_release_steps
Add section to readme for release steps
2 parents 17b8988 + e0a1b68 commit fb9e9d3

File tree

6 files changed

+53
-6
lines changed

6 files changed

+53
-6
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8-
## Unreleased
8+
## [0.1.0rc2] - 2020-03-27
99

1010
### Added
1111

1212
- Use sky-wallet as signer.
1313
- Spend in single transaction coins owned by multiple wallets (same altcoin plugin)
1414
- Added logger for the app and proper error handling
1515
- Built-in support for SkyWallet hardware wallet as signer for Skycoin transactions
16-
- Built-in support iand GUI for applying operations upon SkyWallet hardware devices
16+
- Built-in support and GUI for applying operations upon SkyWallet hardware devices
1717
- A UI to show blockchains
1818
- GUI for status of peer-to-peer exchange network of cryptocurrencies
1919
- GUI to render unspent outputs

README.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,47 @@ lint Run linters. Use make install-linters first.
117117

118118
Type `make help` in your console for details.
119119

120+
## Releases
121+
122+
### Update the version
123+
124+
0. If the `master` branch has commits that are not in `develop` (e.g. due to a hotfix applied to `master`), merge `master` into `develop`
125+
0. Update `CHANGELOG.md`: move the "unreleased" changes to the version and add the date
126+
0. Update the files in https://github.com/skycoin/repo-info by following the [metadata update procedure](https://github.com/skycoin/repo-info/#updating-skycoin-repository-metadate),
127+
0. Merge these changes to `develop`
128+
0. Follow the steps in [pre-release testing](#pre-release-testing)
129+
0. Make a PR merging `develop` into `master`
130+
0. Review the PR and merge it
131+
0. Tag the `master` branch with the version number. Version tags start with `v`, e.g. `v0.1.0`.
132+
Sign the tag. If you have your GPG key in github, creating a release on the Github website will automatically tag the release.
133+
It can be tagged from the command line with `git tag -as v0.20.0 $COMMIT_ID`, but Github will not recognize it as a "release".
134+
0. Make sure that the app runs properly from the `master` branch
135+
0. Release builds are created and uploaded by travis. To do it manually, checkout the `master` branch and follow the [create release builds](#creating-release-builds) instructions.
136+
137+
If there are problems discovered after merging to `master`, start over, and increment the 3rd version number.
138+
For example, `v0.1.0` becomes `v0.1.1`, for minor fixes.
139+
140+
### Pre-release testing
141+
142+
Performs these actions before releasing:
143+
144+
* `make test-sky` Run Skycoin plugin test suite
145+
* `make test-core` Run tests for API core and helpers
146+
* `make test-data` Run tests for data package
147+
* `make test-cover` Show more details of test coverage
148+
* `make test` Run project test suite
149+
150+
### Creating release builds
151+
152+
Travis should build Linux and MacOS builds and upload to github releases
153+
154+
If you do it manually, you must follow the next steps:
155+
156+
* `make prepare-release` Change the resources in the app and prepare to release the app
157+
* `make clean` Remove temporary files
158+
* `make build` Build FiberCrypto Wallet
159+
* Compress the content in `deploy` folder and inside that folder
160+
161+
120162
## WIP
121163
This is a Work-In-Progress.

qml.qrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@
2929
<file>src/ui/WalletSettings.qml</file>
3030
<file>src/ui/Settings.qml</file>
3131
<file>src/ui/SettingsAddressBook.qml</file>
32+
<file>src/ui/AddressBook.qml</file>
3233
<file>src/ui/MenuThemeAccent.qml</file>
3334
<file>src/ui/ToolButtonQR.qml</file>
3435
<file>src/ui/Delegates/WalletListDelegate.qml</file>
36+
<file>src/ui/Delegates/AddressListDelegate.qml</file>
37+
<file>src/ui/Delegates/ContactDelegate.qml</file>
3538
<file>src/ui/Delegates/WalletListAddressDelegate.qml</file>
3639
<file>src/ui/Delegates/NetworkingListDelegate.qml</file>
3740
<file>src/ui/Delegates/OutputsListDelegate.qml</file>
@@ -44,6 +47,11 @@
4447
<file>src/ui/Delegates/HistoryFilterListAddressDelegate.qml</file>
4548
<file>src/ui/Delegates/PendingTransactionsDelegate.qml</file>
4649
<file>src/ui/Delegates/TransactionAddressDelegate.qml</file>
50+
<file>src/ui/Delegates/SectionDelegate.qml</file>
51+
<file>src/ui/Dialogs/DialogSelectAddressByAddressBook.qml</file>
52+
<file>src/ui/Dialogs/DialogShowContact.qml</file>
53+
<file>src/ui/Dialogs/DialogSelectSecType.qml</file>
54+
<file>src/ui/Dialogs/DialogAddContact.qml</file>
4755
<file>src/ui/Dialogs/MsgDialog.qml</file>
4856
<file>src/ui/Dialogs/DialogTransactionDetails.qml</file>
4957
<file>src/ui/Dialogs/RestoreBackupWordsDialog.qml</file>

src/ui/Delegates/AddressListDelegate.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import QtQuick.Controls.Material 2.12
44
import QtQuick.Layouts 1.12
55

66
// Resource imports
7-
// import "qrc:/ui/src/ui/"
87
// import "qrc:/ui/src/ui/Controls"
98
// import "qrc:/ui/src/ui"
109
import "../" // For quick UI development, switch back to resources when making a release

src/ui/Delegates/ContactDelegate.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import QtQuick.Layouts 1.12
33
import QtQuick.Controls 2.12
44
import QtQuick.Controls.Material 2.12
55
import "../Dialogs"
6+
// import "qrc:/ui/src/ui/Dialogs"
67

78
ItemDelegate {
89
id: contactDelegate

src/ui/HistoryFilterList.qml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ import WalletsManager 1.0
77
// import "qrc:/ui/src/ui/Delegates"
88
import "Delegates/" // For quick UI development, switch back to resources when making a release
99

10-
11-
12-
1310
ScrollView {
1411
id: historyFilterDelegate
1512
signal loadWallets()

0 commit comments

Comments
 (0)