Skip to content

Comments

INF-824: Fix cargo build in nix-shell#329

Merged
mergify[bot] merged 3 commits intomasterfrom
nm-cmake-bash
Jan 22, 2020
Merged

INF-824: Fix cargo build in nix-shell#329
mergify[bot] merged 3 commits intomasterfrom
nm-cmake-bash

Conversation

@nmattia
Copy link
Contributor

@nmattia nmattia commented Jan 20, 2020 •
edited
Loading

This fixes two issues introduced when we switched on the fully static linux builds:

  • the cmake wrapper now starts with a shebang to ensure that the user's shell is not used (CC @enzoh )
  • the stdenv.cc input is removed from the dfx shell; otherwise cargo sometimes uses that (incorrect) ld.

I've tried cargo building both on Linux and Darwin.

EDIT

I've added a few more fixes. Three in total:

INF-824: don't import stdenv.cc in dfx shell

Otherwise cargo sometimes picks up the wrong ld.

INF-838: Ensure tests are run in static builds

Otherwise the tests aren't run on Linux

INF-839: Make sure build dependencies are cached

This makes sure [build-dependencies] are cached. Build time went from 1mn51s to 54s on my machine.

@nmattia nmattia marked this pull request as ready for review January 20, 2020 14:18
@nmattia nmattia requested a review from a team as a code owner January 20, 2020 14:18
@nmattia nmattia changed the title INF-824: Make sure bash is used in cmake wrapper INF-824: Fix cargo build in nix-shell Jan 20, 2020
@nmattia
INF-824: don't import stdenv.cc in dfx shell
a810cab 
Otherwise `cargo` sometimes picks up the wrong `ld`.

INF-838: Ensure tests are run in static builds

Otherwise the tests aren't run on Linux

INF-839: Make sure build dependencies are cached

This makes sure `[build-dependencies]` are cached. Build time went from 1mn51s to 54s on my machine.
pikajude
pikajude approved these changes Jan 21, 2020
View reviewed changes
Copy link
Contributor

@pikajude pikajude left a comment

Choose a reason for hiding this comment

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

LGTM

@enzoh
Copy link
Contributor

enzoh commented Jan 21, 2020

Awesome thanks guys!

@mergify mergify bot merged commit b8a6688 into master Jan 22, 2020
@mergify mergify bot deleted the nm-cmake-bash branch January 22, 2020 10:31
dfinity-bot added a commit that referenced this pull request Jul 8, 2020
@dfinity-bot
build: niv advisory-db: update aa789b9c -> 6b10ce09
ce45381 
## Changelog for advisory-db:
Branch: 
Commits: [rustsec/advisory-db@aa789b9c...6b10ce09](rustsec/advisory-db@aa789b9...6b10ce0)

* [`cff4f820`](rustsec/advisory-db@cff4f82) warn about CVE-2020-1967
* [`b0bc62bd`](rustsec/advisory-db@b0bc62b) Add `cargo-deny` to the list RustSec clients
* [`e44e26f3`](rustsec/advisory-db@e44e26f) Assign RUSTSEC-2020-0015 to openssl-src
* [`b1d3a5e7`](rustsec/advisory-db@b1d3a5e) Advisory for rio
* [`25f622ba`](rustsec/advisory-db@25f622b) tempdir crate has been deprecated since 2018-02-13.
* [`a3c68605`](rustsec/advisory-db@a3c6860) net2 crate has been deprecated; use socket2 instead
* [`1639be65`](rustsec/advisory-db@1639be6) Assign RUSTSEC-2020-0016 to net2
* [`7d4ce9ae`](rustsec/advisory-db@7d4ce9a) Assign RUSTSEC-2018-0017 to tempdir
* [`0f5a2dc2`](rustsec/advisory-db@0f5a2dc) Add advisory for internment ([RustSec/advisory-db⁠#306](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/306))
* [`8587ec25`](rustsec/advisory-db@8587ec2) Assign RUSTSEC-2020-0017 to internment ([RustSec/advisory-db⁠#309](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/309))
* [`5049594b`](rustsec/advisory-db@5049594) Add unmaintained crate advisory for `block-cipher-trait` (RUSTSEC-2020-0018) ([RustSec/advisory-db⁠#310](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/310))
* [`ae22eb47`](rustsec/advisory-db@ae22eb4) CONTRIBUTING: mention soundness issues ([RustSec/advisory-db⁠#314](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/314))
* [`7c96397e`](rustsec/advisory-db@7c96397) Security advisory for AtheMathmo/rulinalg[RustSec/advisory-db⁠#201](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/201)
* [`8149410e`](rustsec/advisory-db@8149410) Fix toml format error
* [`45495b76`](rustsec/advisory-db@45495b7) .github: bump rustsec-admin cache key ([RustSec/advisory-db⁠#321](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/321))
* [`418954a9`](rustsec/advisory-db@418954a) Create github action to assign RUSTSEC ids ([RustSec/advisory-db⁠#311](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/311))
* [`48c86534`](rustsec/advisory-db@48c8653) Attempt to fix failing assign-ids task ([RustSec/advisory-db⁠#322](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/322))
* [`de07a7d2`](rustsec/advisory-db@de07a7d) Add tokio-rustls DoS advisory ([RustSec/advisory-db⁠#304](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/304))
* [`46c23f6c`](rustsec/advisory-db@46c23f6) Assign RUSTSEC IDs ([RustSec/advisory-db⁠#323](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/323))
* [`9cd619f1`](rustsec/advisory-db@9cd619f) make memoffset advisory informational ([RustSec/advisory-db⁠#317](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/317))
* [`1dfcb1d6`](rustsec/advisory-db@1dfcb1d) .github: lint advisories after assigning ID ([RustSec/advisory-db⁠#324](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/324))
* [`6e2241c0`](rustsec/advisory-db@6e2241c) stb_truetype crate has been deprecated; use ttf-parser instead ([RustSec/advisory-db⁠#307](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/307))
* [`07ae3fb2`](rustsec/advisory-db@07ae3fb) Assign RUSTSEC IDs ([RustSec/advisory-db⁠#325](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/325))
* [`49fcc50d`](rustsec/advisory-db@49fcc50) Reflect PR feedback and describe what might happen
* [`297725a1`](rustsec/advisory-db@297725a) README.md: bump maintained quarter comment
* [`73b40e7d`](rustsec/advisory-db@73b40e7) Assign RUSTSEC IDs ([RustSec/advisory-db⁠#326](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/326))
* [`ee09393d`](rustsec/advisory-db@ee09393) Security advisory for bqv/ozone
* [`c649f538`](rustsec/advisory-db@c649f53) Assign RUSTSEC-2020-0022 to ozone ([RustSec/advisory-db⁠#329](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/329))
* [`6b56bccc`](rustsec/advisory-db@6b56bcc) Assign RUSTSEC IDs
* [`6b10ce09`](rustsec/advisory-db@6b10ce0) Update yaml-rust advirsory to indicate clap as non-vulnerable ([RustSec/advisory-db⁠#331](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/331))
dfinity-bot added a commit that referenced this pull request Jul 9, 2020
@dfinity-bot
build: niv advisory-db: update aa789b9c -> 6b10ce09
ad66afa 
## Changelog for advisory-db:
Branch: 
Commits: [rustsec/advisory-db@aa789b9c...6b10ce09](rustsec/advisory-db@aa789b9...6b10ce0)

* [`cff4f820`](rustsec/advisory-db@cff4f82) warn about CVE-2020-1967
* [`b0bc62bd`](rustsec/advisory-db@b0bc62b) Add `cargo-deny` to the list RustSec clients
* [`e44e26f3`](rustsec/advisory-db@e44e26f) Assign RUSTSEC-2020-0015 to openssl-src
* [`b1d3a5e7`](rustsec/advisory-db@b1d3a5e) Advisory for rio
* [`25f622ba`](rustsec/advisory-db@25f622b) tempdir crate has been deprecated since 2018-02-13.
* [`a3c68605`](rustsec/advisory-db@a3c6860) net2 crate has been deprecated; use socket2 instead
* [`1639be65`](rustsec/advisory-db@1639be6) Assign RUSTSEC-2020-0016 to net2
* [`7d4ce9ae`](rustsec/advisory-db@7d4ce9a) Assign RUSTSEC-2018-0017 to tempdir
* [`0f5a2dc2`](rustsec/advisory-db@0f5a2dc) Add advisory for internment ([RustSec/advisory-db⁠#306](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/306))
* [`8587ec25`](rustsec/advisory-db@8587ec2) Assign RUSTSEC-2020-0017 to internment ([RustSec/advisory-db⁠#309](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/309))
* [`5049594b`](rustsec/advisory-db@5049594) Add unmaintained crate advisory for `block-cipher-trait` (RUSTSEC-2020-0018) ([RustSec/advisory-db⁠#310](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/310))
* [`ae22eb47`](rustsec/advisory-db@ae22eb4) CONTRIBUTING: mention soundness issues ([RustSec/advisory-db⁠#314](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/314))
* [`7c96397e`](rustsec/advisory-db@7c96397) Security advisory for AtheMathmo/rulinalg[RustSec/advisory-db⁠#201](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/201)
* [`8149410e`](rustsec/advisory-db@8149410) Fix toml format error
* [`45495b76`](rustsec/advisory-db@45495b7) .github: bump rustsec-admin cache key ([RustSec/advisory-db⁠#321](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/321))
* [`418954a9`](rustsec/advisory-db@418954a) Create github action to assign RUSTSEC ids ([RustSec/advisory-db⁠#311](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/311))
* [`48c86534`](rustsec/advisory-db@48c8653) Attempt to fix failing assign-ids task ([RustSec/advisory-db⁠#322](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/322))
* [`de07a7d2`](rustsec/advisory-db@de07a7d) Add tokio-rustls DoS advisory ([RustSec/advisory-db⁠#304](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/304))
* [`46c23f6c`](rustsec/advisory-db@46c23f6) Assign RUSTSEC IDs ([RustSec/advisory-db⁠#323](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/323))
* [`9cd619f1`](rustsec/advisory-db@9cd619f) make memoffset advisory informational ([RustSec/advisory-db⁠#317](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/317))
* [`1dfcb1d6`](rustsec/advisory-db@1dfcb1d) .github: lint advisories after assigning ID ([RustSec/advisory-db⁠#324](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/324))
* [`6e2241c0`](rustsec/advisory-db@6e2241c) stb_truetype crate has been deprecated; use ttf-parser instead ([RustSec/advisory-db⁠#307](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/307))
* [`07ae3fb2`](rustsec/advisory-db@07ae3fb) Assign RUSTSEC IDs ([RustSec/advisory-db⁠#325](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/325))
* [`49fcc50d`](rustsec/advisory-db@49fcc50) Reflect PR feedback and describe what might happen
* [`297725a1`](rustsec/advisory-db@297725a) README.md: bump maintained quarter comment
* [`73b40e7d`](rustsec/advisory-db@73b40e7) Assign RUSTSEC IDs ([RustSec/advisory-db⁠#326](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/326))
* [`ee09393d`](rustsec/advisory-db@ee09393) Security advisory for bqv/ozone
* [`c649f538`](rustsec/advisory-db@c649f53) Assign RUSTSEC-2020-0022 to ozone ([RustSec/advisory-db⁠#329](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/329))
* [`6b56bccc`](rustsec/advisory-db@6b56bcc) Assign RUSTSEC IDs
* [`6b10ce09`](rustsec/advisory-db@6b10ce0) Update yaml-rust advirsory to indicate clap as non-vulnerable ([RustSec/advisory-db⁠#331](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/331))
mergify bot pushed a commit that referenced this pull request Jul 14, 2020
@dfinity-bot
build: niv advisory-db: update aa789b9c -> 6b10ce09 (#799)
237f07e 
## Changelog for advisory-db:
Branch: 
Commits: [rustsec/advisory-db@aa789b9c...6b10ce09](rustsec/advisory-db@aa789b9...6b10ce0)

* [`cff4f820`](rustsec/advisory-db@cff4f82) warn about CVE-2020-1967
* [`b0bc62bd`](rustsec/advisory-db@b0bc62b) Add `cargo-deny` to the list RustSec clients
* [`e44e26f3`](rustsec/advisory-db@e44e26f) Assign RUSTSEC-2020-0015 to openssl-src
* [`b1d3a5e7`](rustsec/advisory-db@b1d3a5e) Advisory for rio
* [`25f622ba`](rustsec/advisory-db@25f622b) tempdir crate has been deprecated since 2018-02-13.
* [`a3c68605`](rustsec/advisory-db@a3c6860) net2 crate has been deprecated; use socket2 instead
* [`1639be65`](rustsec/advisory-db@1639be6) Assign RUSTSEC-2020-0016 to net2
* [`7d4ce9ae`](rustsec/advisory-db@7d4ce9a) Assign RUSTSEC-2018-0017 to tempdir
* [`0f5a2dc2`](rustsec/advisory-db@0f5a2dc) Add advisory for internment ([RustSec/advisory-db⁠#306](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/306))
* [`8587ec25`](rustsec/advisory-db@8587ec2) Assign RUSTSEC-2020-0017 to internment ([RustSec/advisory-db⁠#309](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/309))
* [`5049594b`](rustsec/advisory-db@5049594) Add unmaintained crate advisory for `block-cipher-trait` (RUSTSEC-2020-0018) ([RustSec/advisory-db⁠#310](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/310))
* [`ae22eb47`](rustsec/advisory-db@ae22eb4) CONTRIBUTING: mention soundness issues ([RustSec/advisory-db⁠#314](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/314))
* [`7c96397e`](rustsec/advisory-db@7c96397) Security advisory for AtheMathmo/rulinalg[RustSec/advisory-db⁠#201](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/201)
* [`8149410e`](rustsec/advisory-db@8149410) Fix toml format error
* [`45495b76`](rustsec/advisory-db@45495b7) .github: bump rustsec-admin cache key ([RustSec/advisory-db⁠#321](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/321))
* [`418954a9`](rustsec/advisory-db@418954a) Create github action to assign RUSTSEC ids ([RustSec/advisory-db⁠#311](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/311))
* [`48c86534`](rustsec/advisory-db@48c8653) Attempt to fix failing assign-ids task ([RustSec/advisory-db⁠#322](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/322))
* [`de07a7d2`](rustsec/advisory-db@de07a7d) Add tokio-rustls DoS advisory ([RustSec/advisory-db⁠#304](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/304))
* [`46c23f6c`](rustsec/advisory-db@46c23f6) Assign RUSTSEC IDs ([RustSec/advisory-db⁠#323](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/323))
* [`9cd619f1`](rustsec/advisory-db@9cd619f) make memoffset advisory informational ([RustSec/advisory-db⁠#317](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/317))
* [`1dfcb1d6`](rustsec/advisory-db@1dfcb1d) .github: lint advisories after assigning ID ([RustSec/advisory-db⁠#324](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/324))
* [`6e2241c0`](rustsec/advisory-db@6e2241c) stb_truetype crate has been deprecated; use ttf-parser instead ([RustSec/advisory-db⁠#307](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/307))
* [`07ae3fb2`](rustsec/advisory-db@07ae3fb) Assign RUSTSEC IDs ([RustSec/advisory-db⁠#325](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/325))
* [`49fcc50d`](rustsec/advisory-db@49fcc50) Reflect PR feedback and describe what might happen
* [`297725a1`](rustsec/advisory-db@297725a) README.md: bump maintained quarter comment
* [`73b40e7d`](rustsec/advisory-db@73b40e7) Assign RUSTSEC IDs ([RustSec/advisory-db⁠#326](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/326))
* [`ee09393d`](rustsec/advisory-db@ee09393) Security advisory for bqv/ozone
* [`c649f538`](rustsec/advisory-db@c649f53) Assign RUSTSEC-2020-0022 to ozone ([RustSec/advisory-db⁠#329](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/329))
* [`6b56bccc`](rustsec/advisory-db@6b56bcc) Assign RUSTSEC IDs
* [`6b10ce09`](rustsec/advisory-db@6b10ce0) Update yaml-rust advirsory to indicate clap as non-vulnerable ([RustSec/advisory-db⁠#331](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/331))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@basvandijk basvandijk basvandijk approved these changes

+1 more reviewer

@pikajude pikajude pikajude approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nmattia @enzoh @pikajude @basvandijk