Skip to content

Commit

Permalink
Merge pull request #345 from simelo/stdevMac_t344_add_release_steps
Browse files Browse the repository at this point in the history
Add section to readme for release steps
  • Loading branch information
stdevMac committed Mar 12, 2020
2 parents 17b8988 + e0a1b68 commit fb9e9d3
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## Unreleased
## [0.1.0rc2] - 2020-03-27

### Added

- Use sky-wallet as signer.
- Spend in single transaction coins owned by multiple wallets (same altcoin plugin)
- Added logger for the app and proper error handling
- Built-in support for SkyWallet hardware wallet as signer for Skycoin transactions
- Built-in support iand GUI for applying operations upon SkyWallet hardware devices
- Built-in support and GUI for applying operations upon SkyWallet hardware devices
- A UI to show blockchains
- GUI for status of peer-to-peer exchange network of cryptocurrencies
- GUI to render unspent outputs
Expand Down
42 changes: 42 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,47 @@ lint Run linters. Use make install-linters first.

Type `make help` in your console for details.

## Releases

### Update the version

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`
0. Update `CHANGELOG.md`: move the "unreleased" changes to the version and add the date
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),
0. Merge these changes to `develop`
0. Follow the steps in [pre-release testing](#pre-release-testing)
0. Make a PR merging `develop` into `master`
0. Review the PR and merge it
0. Tag the `master` branch with the version number. Version tags start with `v`, e.g. `v0.1.0`.
Sign the tag. If you have your GPG key in github, creating a release on the Github website will automatically tag the release.
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".
0. Make sure that the app runs properly from the `master` branch
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.

If there are problems discovered after merging to `master`, start over, and increment the 3rd version number.
For example, `v0.1.0` becomes `v0.1.1`, for minor fixes.

### Pre-release testing

Performs these actions before releasing:

* `make test-sky` Run Skycoin plugin test suite
* `make test-core` Run tests for API core and helpers
* `make test-data` Run tests for data package
* `make test-cover` Show more details of test coverage
* `make test` Run project test suite

### Creating release builds

Travis should build Linux and MacOS builds and upload to github releases

If you do it manually, you must follow the next steps:

* `make prepare-release` Change the resources in the app and prepare to release the app
* `make clean` Remove temporary files
* `make build` Build FiberCrypto Wallet
* Compress the content in `deploy` folder and inside that folder


## WIP
This is a Work-In-Progress.
8 changes: 8 additions & 0 deletions qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@
<file>src/ui/WalletSettings.qml</file>
<file>src/ui/Settings.qml</file>
<file>src/ui/SettingsAddressBook.qml</file>
<file>src/ui/AddressBook.qml</file>
<file>src/ui/MenuThemeAccent.qml</file>
<file>src/ui/ToolButtonQR.qml</file>
<file>src/ui/Delegates/WalletListDelegate.qml</file>
<file>src/ui/Delegates/AddressListDelegate.qml</file>
<file>src/ui/Delegates/ContactDelegate.qml</file>
<file>src/ui/Delegates/WalletListAddressDelegate.qml</file>
<file>src/ui/Delegates/NetworkingListDelegate.qml</file>
<file>src/ui/Delegates/OutputsListDelegate.qml</file>
Expand All @@ -44,6 +47,11 @@
<file>src/ui/Delegates/HistoryFilterListAddressDelegate.qml</file>
<file>src/ui/Delegates/PendingTransactionsDelegate.qml</file>
<file>src/ui/Delegates/TransactionAddressDelegate.qml</file>
<file>src/ui/Delegates/SectionDelegate.qml</file>
<file>src/ui/Dialogs/DialogSelectAddressByAddressBook.qml</file>
<file>src/ui/Dialogs/DialogShowContact.qml</file>
<file>src/ui/Dialogs/DialogSelectSecType.qml</file>
<file>src/ui/Dialogs/DialogAddContact.qml</file>
<file>src/ui/Dialogs/MsgDialog.qml</file>
<file>src/ui/Dialogs/DialogTransactionDetails.qml</file>
<file>src/ui/Dialogs/RestoreBackupWordsDialog.qml</file>
Expand Down
1 change: 0 additions & 1 deletion src/ui/Delegates/AddressListDelegate.qml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12

// Resource imports
// import "qrc:/ui/src/ui/"
// import "qrc:/ui/src/ui/Controls"
// import "qrc:/ui/src/ui"
import "../" // For quick UI development, switch back to resources when making a release
Expand Down
1 change: 1 addition & 0 deletions src/ui/Delegates/ContactDelegate.qml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import QtQuick.Layouts 1.12
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import "../Dialogs"
// import "qrc:/ui/src/ui/Dialogs"

ItemDelegate {
id: contactDelegate
Expand Down
3 changes: 0 additions & 3 deletions src/ui/HistoryFilterList.qml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ import WalletsManager 1.0
// import "qrc:/ui/src/ui/Delegates"
import "Delegates/" // For quick UI development, switch back to resources when making a release




ScrollView {
id: historyFilterDelegate
signal loadWallets()
Expand Down

0 comments on commit fb9e9d3

Please sign in to comment.