Skip to content

Comments

build: allow split of install.sh#199

Merged
hansl merged 4 commits intomasterfrom
hansl/install-sh-refactor
Dec 1, 2019
Merged

build: allow split of install.sh#199
hansl merged 4 commits intomasterfrom
hansl/install-sh-refactor

Conversation

@hansl
Copy link
Contributor

@hansl hansl commented Nov 22, 2019

And remove comments and separate the linting into its own derivation. That
should allow us to split up in different modules (great) and also lint
locally without having to "do a release".

@hansl hansl requested a review from a team as a code owner November 22, 2019 04:00
eftychis
eftychis reviewed Nov 25, 2019
View reviewed changes
nix/overlays/dfinity-sdk.nix Outdated
} ''
set -Eeuo pipefail
# Check if we have an sh compatible script
shckResult="$(shellcheck -Cnever -f gcc ${shellcheckOpts} "${install-sh}/install.sh" | \
Copy link
Contributor

@eftychis eftychis Nov 25, 2019

Choose a reason for hiding this comment

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

we should check all the files?

Copy link
Contributor Author

@hansl hansl Nov 25, 2019

Choose a reason for hiding this comment

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

We check the end result.

@eftychis
Copy link
Contributor

eftychis commented Nov 25, 2019

I like the idea but

  1. Do we not need to change our install instructions?
  2. The point which we need multiple files perhaps our installer becomes too complicated?

@hansl
Copy link
Contributor Author

hansl commented Nov 25, 2019

@eftychis This takes all the shell scripts and merge them together. There's still 1 install file being deployed.

@nmattia
Copy link
Contributor

nmattia commented Nov 25, 2019

@hansl same thing as #186 , restarted the main build

@hansl
build: allow split of install.sh
f6764a3 
And remove comments and separate the linting into its own derivation. That
should allow us to split up in different modules (great) and also lint
locally without having to "do a release".
@hansl hansl force-pushed the hansl/install-sh-refactor branch from 7af84bf to f6764a3 Compare November 25, 2019 16:46
@hansl
Copy link
Contributor Author

hansl commented Nov 25, 2019

@nmattia Thanks!

@hansl hansl force-pushed the hansl/install-sh-refactor branch from 1d1ae7b to 3e98211 Compare November 25, 2019 22:18
eftychis
eftychis reviewed Nov 28, 2019
View reviewed changes
nix/overlays/dfinity-sdk.nix
# git describe --abbrev=7 --tags
mkdir -p $out

cat $public/install/*.sh > $out/install.sh
Copy link
Contributor

@eftychis eftychis Nov 28, 2019

Choose a reason for hiding this comment

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

Is the ordering standard though?

Copy link
Contributor Author

@hansl hansl Nov 28, 2019

Choose a reason for hiding this comment

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

Yes. Globs were always sorted according to the locale.

eftychis
eftychis approved these changes Nov 28, 2019
View reviewed changes
Copy link
Contributor

@eftychis eftychis left a comment

Choose a reason for hiding this comment

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

Will take another look, but it looks ok.

Could we also add a placeholder that sources all sh files for testing. I find that useful.

@hansl
Copy link
Contributor Author

hansl commented Nov 28, 2019

The install.sh does exactly that.

@hansl hansl merged commit ba0f83d into master Dec 1, 2019
@hansl hansl deleted the hansl/install-sh-refactor branch December 1, 2019 23:21
dfinity-bot added a commit that referenced this pull request Jul 8, 2020
@dfinity-bot
build: niv common: update 05c44edd -> 0030194f
b253d5a 
## Changelog for common:
Branch: master
Commits: [dfinity-lab/common@05c44edd...0030194f](https://github.com/dfinity-lab/common/compare/05c44eddb864464c06c27295460eabcf923bc2e9...0030194fc2454c8a4e42bff87aa82f7f8ed96433)

* [`2a5d4183`](https://github.com/dfinity-lab/common/commit/2a5d4183065f7811edce500e9d20fd5a4fcb10df) niv nixpkgs: update e79d1e83 -> 5a462920
* [`413ce2b3`](https://github.com/dfinity-lab/common/commit/413ce2b3b176863ff33c4fdf276842d7f94bbb5b) rust: 1.41.1 -> 1.43
* [`899366be`](https://github.com/dfinity-lab/common/commit/899366be97d4c79fdcf4230164a7ffca9ed4e309) niv nixpkgs: update 5a462920 -> 05a32d8e
* [`f2c71849`](https://github.com/dfinity-lab/common/commit/f2c7184973a5bd3d4dacfb0c1245d07ef8e39139) Add support for incremental Rust workspaces ([dfinity-lab/common⁠#199](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/199))
* [`f484c11e`](https://github.com/dfinity-lab/common/commit/f484c11e040c2a91204cfddc8ddaca1c5e51979d) Revert "Add support for incremental Rust workspaces ([dfinity-lab/common⁠#199](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/199))" ([dfinity-lab/common⁠#204](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/204))
* [`74c64048`](https://github.com/dfinity-lab/common/commit/74c640486d2e34d3cc63df1a20e4346e07a21bbf) gitSource.nix: Use gitMinimal
* [`fa568e26`](https://github.com/dfinity-lab/common/commit/fa568e267a189ee51721af6d7d08eb2af8d54de4) disable parallel rustc build ([dfinity-lab/common⁠#206](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/206))
* [`90627152`](https://github.com/dfinity-lab/common/commit/9062715209261439648898b03f7652cd3f138399) [INF-1316] Support for overriding cargoBuild ([dfinity-lab/common⁠#207](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/207))
* [`e2d48d84`](https://github.com/dfinity-lab/common/commit/e2d48d8404ccce8252d9a78d76282fc9f1bd026b) nixpkgs: Backports patches for static builds of Haskell ([dfinity-lab/common⁠#208](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/208))
* [`45bbce1c`](https://github.com/dfinity-lab/common/commit/45bbce1cfb34c6b723bbe3f89466a63ae66bfb77) rust: Add release build with symbols ([dfinity-lab/common⁠#209](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/209))
* [`c9a4327d`](https://github.com/dfinity-lab/common/commit/c9a4327df3040921fa27a7b48c6dc924b13a423b) ci: introduce the all-systems-go aggregate job
* [`e8689e50`](https://github.com/dfinity-lab/common/commit/e8689e50dfff33663f498df2baf994eeee39bb7d) Disable selectors2 tests on Darwin
* [`eb8225ea`](https://github.com/dfinity-lab/common/commit/eb8225ea65dfa4bcc688a3d58f7c9633affd9234) nix/overlays/ci.nix: increase schedulingPriority of all-systems-go
* [`dac9442c`](https://github.com/dfinity-lab/common/commit/dac9442c1110253f3386208790757ec11ff4605c) [INF-589] Incremental build support ([dfinity-lab/common⁠#213](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/213))
* [`ebaf4cf7`](https://github.com/dfinity-lab/common/commit/ebaf4cf726e75f2037570f162f79b103a3931bbd) make rustWorkspace overridable
* [`a1fb28aa`](https://github.com/dfinity-lab/common/commit/a1fb28aa2d8ddb6ac730264dc4273c4643b818f7) allow crates-io references for existing naersk builds
* [`724330e8`](https://github.com/dfinity-lab/common/commit/724330e8e6d8db0fdc6d8b835ed7b107333fed44) Update niv-updater-action to v6
dfinity-bot added a commit that referenced this pull request Jul 15, 2020
@dfinity-bot
build: niv common: update 05c44edd -> 9162ebde
70022db 
## Changelog for common:
Branch: master
Commits: [dfinity-lab/common@05c44edd...9162ebde](https://github.com/dfinity-lab/common/compare/05c44eddb864464c06c27295460eabcf923bc2e9...9162ebdee5e914c0a7d22c71596d1760230156df)

* [`2a5d4183`](https://github.com/dfinity-lab/common/commit/2a5d4183065f7811edce500e9d20fd5a4fcb10df) niv nixpkgs: update e79d1e83 -> 5a462920
* [`413ce2b3`](https://github.com/dfinity-lab/common/commit/413ce2b3b176863ff33c4fdf276842d7f94bbb5b) rust: 1.41.1 -> 1.43
* [`899366be`](https://github.com/dfinity-lab/common/commit/899366be97d4c79fdcf4230164a7ffca9ed4e309) niv nixpkgs: update 5a462920 -> 05a32d8e
* [`f2c71849`](https://github.com/dfinity-lab/common/commit/f2c7184973a5bd3d4dacfb0c1245d07ef8e39139) Add support for incremental Rust workspaces ([dfinity-lab/common⁠#199](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/199))
* [`f484c11e`](https://github.com/dfinity-lab/common/commit/f484c11e040c2a91204cfddc8ddaca1c5e51979d) Revert "Add support for incremental Rust workspaces ([dfinity-lab/common⁠#199](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/199))" ([dfinity-lab/common⁠#204](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/204))
* [`74c64048`](https://github.com/dfinity-lab/common/commit/74c640486d2e34d3cc63df1a20e4346e07a21bbf) gitSource.nix: Use gitMinimal
* [`fa568e26`](https://github.com/dfinity-lab/common/commit/fa568e267a189ee51721af6d7d08eb2af8d54de4) disable parallel rustc build ([dfinity-lab/common⁠#206](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/206))
* [`90627152`](https://github.com/dfinity-lab/common/commit/9062715209261439648898b03f7652cd3f138399) [INF-1316] Support for overriding cargoBuild ([dfinity-lab/common⁠#207](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/207))
* [`e2d48d84`](https://github.com/dfinity-lab/common/commit/e2d48d8404ccce8252d9a78d76282fc9f1bd026b) nixpkgs: Backports patches for static builds of Haskell ([dfinity-lab/common⁠#208](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/208))
* [`45bbce1c`](https://github.com/dfinity-lab/common/commit/45bbce1cfb34c6b723bbe3f89466a63ae66bfb77) rust: Add release build with symbols ([dfinity-lab/common⁠#209](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/209))
* [`c9a4327d`](https://github.com/dfinity-lab/common/commit/c9a4327df3040921fa27a7b48c6dc924b13a423b) ci: introduce the all-systems-go aggregate job
* [`e8689e50`](https://github.com/dfinity-lab/common/commit/e8689e50dfff33663f498df2baf994eeee39bb7d) Disable selectors2 tests on Darwin
* [`eb8225ea`](https://github.com/dfinity-lab/common/commit/eb8225ea65dfa4bcc688a3d58f7c9633affd9234) nix/overlays/ci.nix: increase schedulingPriority of all-systems-go
* [`dac9442c`](https://github.com/dfinity-lab/common/commit/dac9442c1110253f3386208790757ec11ff4605c) [INF-589] Incremental build support ([dfinity-lab/common⁠#213](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/213))
* [`ebaf4cf7`](https://github.com/dfinity-lab/common/commit/ebaf4cf726e75f2037570f162f79b103a3931bbd) make rustWorkspace overridable
* [`a1fb28aa`](https://github.com/dfinity-lab/common/commit/a1fb28aa2d8ddb6ac730264dc4273c4643b818f7) allow crates-io references for existing naersk builds
* [`724330e8`](https://github.com/dfinity-lab/common/commit/724330e8e6d8db0fdc6d8b835ed7b107333fed44) Update niv-updater-action to v6
* [`b48fa5d6`](https://github.com/dfinity-lab/common/commit/b48fa5d64ae8aecd4b900f4e04054c942f839e38) Fix typo in README
* [`a63e292f`](https://github.com/dfinity-lab/common/commit/a63e292f45cf2d5238b04fb2a2bc173ea44ba21b) Add a replaceStdenv function ([dfinity-lab/common⁠#202](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/202))
* [`7d3742a2`](https://github.com/dfinity-lab/common/commit/7d3742a2efb70206dac5dcfba78f7102cc2e0b2a) niv cargo2nix: update b9ef68fe -> 31d34998
* [`8431c1e6`](https://github.com/dfinity-lab/common/commit/8431c1e66239f7bc14a0f113c95692648bb211d2) patch ruamel
* [`9162ebde`](https://github.com/dfinity-lab/common/commit/9162ebdee5e914c0a7d22c71596d1760230156df) Migrate back to OpenSSL ([dfinity-lab/common⁠#219](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/219))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@eftychis eftychis eftychis 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.

3 participants

@hansl @eftychis @nmattia