Skip to content
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.

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

Fix dylib references of bundled programs on macOS #2135

Merged
merged 3 commits into from
Sep 18, 2020

Conversation

rvl
Copy link
Contributor

@rvl rvl commented Sep 12, 2020

Issue Number

Resolves #2134

Overview

  • On macOS rewrite dylib references from /nix/store to @executable_path - for every executable in the bundle.
  • Add linking tests to check-bundle.rb for macOS and Linux.

@rvl rvl added the RESOLVING ISSUE Mark a PR as resolving issues, for auto-generated CHANGELOG label Sep 12, 2020
@rvl rvl requested a review from piotr-iohk September 12, 2020 01:09
@rvl rvl self-assigned this Sep 12, 2020
@rvl rvl force-pushed the rvl/2134/fix-macos-bundle branch from af99d54 to e25ba1f Compare September 14, 2020 05:56

tests[wallet].each do |cmd|
tests[wallet].unshift(wallet).each do |cmd|
Copy link
Contributor

Choose a reason for hiding this comment

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

:)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My first ruby program 🙂

Copy link
Contributor

@piotr-iohk piotr-iohk left a comment

Choose a reason for hiding this comment

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

👍

@rvl rvl force-pushed the rvl/2134/fix-macos-bundle branch from f9a9720 to 3e4a4ac Compare September 14, 2020 09:44
@rvl rvl force-pushed the rvl/2134/fix-macos-bundle branch from 9530a0e to e43dace Compare September 16, 2020 04:49
@rvl
Copy link
Contributor Author

rvl commented Sep 16, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Sep 16, 2020
2135: Fix dylib references of bundled programs on macOS r=rvl a=rvl

### Issue Number

Resolves #2134

### Overview

- On macOS rewrite dylib references from `/nix/store` to `@executable_path` - for every executable in the bundle.
- Add linking tests to `check-bundle.rb` for macOS and Linux.


Co-authored-by: Rodney Lorrimar <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Sep 16, 2020

Build failed:

https://hydra.iohk.io/build/4137204/nixlog/1/tail

Extract from log:

Failures:

  src/Test/Integration/Scenario/API/Shelley/Wallets.hs:467:23:
  1) API Specifications, SHELLEY_WALLETS, WALLETS_CREATE_08 - address_pool_gap, 100000
       expected: Status {statusCode = 201, statusMessage = "Created"}
        but got: Status {statusCode = 409, statusMessage = "Conflict"}

       from the following response: Left (DecodeFailure "Error in $: parsing Cardano.Wallet.Api.Types.ApiWallet(ApiWallet) failed, key \"id\" not found: Response {responseStatus = Status {statusCode = 409, statusMessage = \"Conflict\"}, responseVersion = HTTP/1.1, responseHeaders = [(\"Transfer-Encoding\",\"chunked\"),(\"Date\",\"Wed, 16 Sep 2020 07:19:28 GMT\"),(\"Server\",\"Warp/3.3.5\")], responseBody = \"{\\\"code\\\":\\\"wallet_already_exists\\\",\\\"message\\\":\\\"This operation would yield a wallet with the following id: a6b6625cd2bfc51a296b0933f77020991cc80374 However, I already know of a wallet with this id.\\\"}\", responseCookieJar = CJ {expose = []}, responseClose' = ResponseClose}")

  To rerun use: --match "/API Specifications/SHELLEY_WALLETS/WALLETS_CREATE_08 - address_pool_gap/100000/"

@rvl
Copy link
Contributor Author

rvl commented Sep 17, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Sep 17, 2020
2125: CLI: Add option "cardano-wallet transaction create --metadata=JSON" r=rvl a=rvl

### Issue Number

ADP-307 / #2076

### Overview

- Adds `--metadata=JSON` option to transaction create and fee estimate commands.

### Comments

Will update the CLI wiki page after merging.


2135: Fix dylib references of bundled programs on macOS r=rvl a=rvl

### Issue Number

Resolves #2134

### Overview

- On macOS rewrite dylib references from `/nix/store` to `@executable_path` - for every executable in the bundle.
- Add linking tests to `check-bundle.rb` for macOS and Linux.


2141: Make Jörmungandr tests pass again r=rvl a=piotr-iohk

# Issue Number

<!-- Put here a reference to the issue this PR relates to and which requirements it tackles -->


# Overview

- 3665332
  Disable STAKE_POOLS_* tests due to #2140
  
- 6e276af
  Remove hard-coded mnemonics in case not necessary in integration tests
  
- 038c365
  Remove Shelley specific transaction suite. Add few more basic transaction tests to Jormungandr suite.
  
- 6e98d4b
  BYRON_MIGRATE_01 - make Jormungandr big wallet for migration smaller (the same as Shelley one) and adjust to pass on both backends
  
- e3d6a55
  adjust genMnemonics to be more standard



# Comments

<!-- Additional comments or screenshots to attach if any -->

<!-- 
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: Rodney Lorrimar <[email protected]>
Co-authored-by: Piotr Stachyra <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Sep 17, 2020

Build failed (retrying...):

iohk-bors bot added a commit that referenced this pull request Sep 17, 2020
2135: Fix dylib references of bundled programs on macOS r=rvl a=rvl

### Issue Number

Resolves #2134

### Overview

- On macOS rewrite dylib references from `/nix/store` to `@executable_path` - for every executable in the bundle.
- Add linking tests to `check-bundle.rb` for macOS and Linux.


2141: Make Jörmungandr tests pass again r=rvl a=piotr-iohk

# Issue Number

<!-- Put here a reference to the issue this PR relates to and which requirements it tackles -->


# Overview

- 3665332
  Disable STAKE_POOLS_* tests due to #2140
  
- 6e276af
  Remove hard-coded mnemonics in case not necessary in integration tests
  
- 038c365
  Remove Shelley specific transaction suite. Add few more basic transaction tests to Jormungandr suite.
  
- 6e98d4b
  BYRON_MIGRATE_01 - make Jormungandr big wallet for migration smaller (the same as Shelley one) and adjust to pass on both backends
  
- e3d6a55
  adjust genMnemonics to be more standard



# Comments

<!-- Additional comments or screenshots to attach if any -->

<!-- 
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: Rodney Lorrimar <[email protected]>
Co-authored-by: Piotr Stachyra <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Sep 17, 2020

Build failed (retrying...):

iohk-bors bot added a commit that referenced this pull request Sep 17, 2020
2135: Fix dylib references of bundled programs on macOS r=rvl a=rvl

### Issue Number

Resolves #2134

### Overview

- On macOS rewrite dylib references from `/nix/store` to `@executable_path` - for every executable in the bundle.
- Add linking tests to `check-bundle.rb` for macOS and Linux.


Co-authored-by: Rodney Lorrimar <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Sep 17, 2020

Build failed:

@Anviking
Copy link
Member

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Sep 18, 2020

Build succeeded:

@iohk-bors iohk-bors bot merged commit d393d82 into master Sep 18, 2020
@iohk-bors iohk-bors bot deleted the rvl/2134/fix-macos-bundle branch September 18, 2020 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RESOLVING ISSUE Mark a PR as resolving issues, for auto-generated CHANGELOG
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bech32, cardano-{address,tx} release executables don't work on macOS without nix
3 participants