Skip to content

appveyor: Write @PACKAGE_NAME@ to config #15903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
maflcko merged 1 commit into from
Apr 26, 2019
Merged

appveyor: Write @PACKAGE_NAME@ to config #15903

maflcko merged 1 commit into from
Apr 26, 2019

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Apr 26, 2019 •
edited
Loading

fix tests which are currently failing on appveyor after #15896

@maflcko maflcko added this to the 0.19.0 milestone Apr 26, 2019
@hebasto
Copy link
Member

hebasto commented Apr 26, 2019

Should be the next patch applied aswell?

diff --git a/build_msvc/bitcoin_config.h b/build_msvc/bitcoin_config.h
index 4ac27dae3..817bb57ce 100644
--- a/build_msvc/bitcoin_config.h
+++ b/build_msvc/bitcoin_config.h
@@ -14,7 +14,7 @@
 #define CLIENT_VERSION_MAJOR 1
 
 /* Minor version */
-#define CLIENT_VERSION_MINOR 17
+#define CLIENT_VERSION_MINOR 18
 
 /* Build revision */
 #define CLIENT_VERSION_REVISION 99

ryanofsky
ryanofsky approved these changes Apr 26, 2019
View reviewed changes
Copy link
Contributor

@ryanofsky ryanofsky left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK faebd8c. Not following your own "Please provide clear motivation for your patch" advice maybe, but I gather the motivation is to fix tests which are currently failing on appveyor after #15896?

@Sjors Sjors mentioned this pull request Apr 26, 2019
Merged
@Sjors
Copy link
Member

Sjors commented Apr 26, 2019

utACK faebd8c if AppVeyor blesses it.

@maflcko
Copy link
Member Author

maflcko commented Apr 26, 2019

@hebasto That should be mentioned in the branch-off todo list. See for example #15607

@maflcko
Copy link
Member Author

maflcko commented Apr 26, 2019

Took @ryanofsky 's motivation and copy-pasted it into the first comment

@maflcko maflcko merged commit faebd8c into bitcoin:master Apr 26, 2019
maflcko pushed a commit that referenced this pull request Apr 26, 2019
Merge #15903: appveyor: Write @PACKAGE_NAME@ to config
ec519d4 
faebd8c appveyor: Write @PACKAGE_NAME@ to config (MarcoFalke)

Pull request description:

  fix tests which are currently failing on appveyor after #15896

ACKs for commit faebd8:
  Sjors:
    utACK faebd8c if AppVeyor blesses it.
  ryanofsky:
    utACK faebd8c. Not following your own "Please provide clear motivation for your patch" advice maybe, but I gather the motivation is to fix tests which are currently failing on appveyor after #15896?

Tree-SHA512: 645cc9f82a4897659bfd41d0c645e21201c43bceb36a073e7fa9fff6d38e8190e7b23e44f77f18ecf3cd1794a9a11b8cabfb33d1a477e7417d839f9451b8253d
@luke-jr
Copy link
Member

luke-jr commented Apr 27, 2019

Why isn't AppVeyor using standard build stuff? :/

@hebasto hebasto mentioned this pull request Apr 27, 2019
Merged
@maflcko maflcko deleted the 1904-appveyorPackage branch April 27, 2019 12:54
maflcko pushed a commit that referenced this pull request Apr 29, 2019
Merge #15908: docs: Align MSVC build options with Linux build ones
8da1aa4 
e47dc4f Include bitcoin_config.h in release process (Hennadii Stepanov)
48ed65b Align MSVC build options with Linux build ones (Hennadii Stepanov)

Pull request description:

  Ref:
  - #11526
  - #15903 (comment)
  - #15903 (comment) by MarcoFalke

ACKs for commit e47dc4:
  MarcoFalke:
    utACK e47dc4f
  Sjors:
    utACK e47dc4f
  fanquake:
    utACK e47dc4f
  practicalswift:
    utACK e47dc4f

Tree-SHA512: 32ac3e9fd0b41a4916dd520bdf8bb6c71cea7218434b67a173b51b3cdb0da3f10a68b9e5205c27a52f456ac9ed14f8f8363a50d108a80a5dd55b085a6bd435b9
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@ryanofsky ryanofsky ryanofsky approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

0.19.0

Development

Successfully merging this pull request may close these issues.

5 participants

@maflcko @hebasto @Sjors @luke-jr @ryanofsky