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

Build-a-rama, June 2016 Edition #743

Merged
merged 6 commits into from
Jun 11, 2016

Conversation

fnichol
Copy link
Collaborator

@fnichol fnichol commented Jun 11, 2016

No description provided.

fnichol added 6 commits June 11, 2016 13:10
This reverts commit 1703723.

Signed-off-by: Fletcher Nichol <[email protected]>
This change adds the `core/unzip` package to the dependencies for
`core/hab-plan-build` (i.e. the "build" program) with the result that
`unzip` will be present on `$PATH` for Plan authors.

Adding a new dependency to the build toolchain also meant updating the
base build set. Additionally, as `core/bash-static` and
`core/coreutils-static` are no longer in the build toolchain critical
path (from the retirement of `hab-bpm`), these were dropped from the
base build set.

Closes #591

Signed-off-by: Fletcher Nichol <[email protected]>
This will add `vi` onto a Plan author's `$PATH` if they are in an
interactive Studio.

Signed-off-by: Fletcher Nichol <[email protected]>
This change fixes a mismatch argument value in the `hab pkg hash`
subcommand (`TARGET` vs. `SOURCE`).

Aditionally, the subcommand ordering the `cli.rs` and `main.rs` were
re-sorted in order to make the fake fuzzy matching code easier to manage
and to facilitate side-by-side viewing of the 2 source files.

Finally, the auth token parsing/lookup logic was refactored into a
function, similar to the origin parsing/lookup logic. This refactoring
adds an `auth_token` configuration value that can be set in a user's
`etc/cli.toml` configuration file. A later change may add an additional
question to the `hab cli setup` in order to populate this automatically.

Signed-off-by: Fletcher Nichol <[email protected]>
Signed-off-by: Fletcher Nichol <[email protected]>
This change addresses 2 issues:

* The file that contains the cryptographic hashes to be stored in the
  `FILES` metadata file needs to be created under the source cache, not
  in the `$PLAN_CONTEXT` directory.
* The `$HAB_BIN` variable must be used throughout the program and not
  the `$_hab_cmd` variable, who's role has been downplayed.

References #725

Signed-off-by: Fletcher Nichol <[email protected]>
@fnichol fnichol force-pushed the fnichol/build-a-rama-june-2016-edition branch from 9a9f746 to 1fd452d Compare June 11, 2016 19:11
@@ -33,6 +33,9 @@ do_build() {
do_install() {
do_default_install

# Add a `vi` which symlinks to `vim`
ln -sv vim $pkg_prefix/bin/vi
Copy link
Contributor

Choose a reason for hiding this comment

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

gif-keyboard-5258042838816819735

@fnichol fnichol changed the title [WIP] Build-a-rama, June 2016 Edition Build-a-rama, June 2016 Edition Jun 11, 2016
@fnichol
Copy link
Collaborator Author

fnichol commented Jun 11, 2016

gif-keyboard-7789369856962451579

@thesentinels r+

@thesentinels
Copy link
Contributor

📌 Commit 1fd452d has been approved by fnichol

@thesentinels
Copy link
Contributor

⌛ Testing commit 1fd452d with merge afa81e1...

thesentinels pushed a commit that referenced this pull request Jun 11, 2016
This reverts commit 1703723.

Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
thesentinels pushed a commit that referenced this pull request Jun 11, 2016
This change adds the `core/unzip` package to the dependencies for
`core/hab-plan-build` (i.e. the "build" program) with the result that
`unzip` will be present on `$PATH` for Plan authors.

Adding a new dependency to the build toolchain also meant updating the
base build set. Additionally, as `core/bash-static` and
`core/coreutils-static` are no longer in the build toolchain critical
path (from the retirement of `hab-bpm`), these were dropped from the
base build set.

Closes #591

Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
thesentinels pushed a commit that referenced this pull request Jun 11, 2016
This will add `vi` onto a Plan author's `$PATH` if they are in an
interactive Studio.

Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
thesentinels pushed a commit that referenced this pull request Jun 11, 2016
This change fixes a mismatch argument value in the `hab pkg hash`
subcommand (`TARGET` vs. `SOURCE`).

Aditionally, the subcommand ordering the `cli.rs` and `main.rs` were
re-sorted in order to make the fake fuzzy matching code easier to manage
and to facilitate side-by-side viewing of the 2 source files.

Finally, the auth token parsing/lookup logic was refactored into a
function, similar to the origin parsing/lookup logic. This refactoring
adds an `auth_token` configuration value that can be set in a user's
`etc/cli.toml` configuration file. A later change may add an additional
question to the `hab cli setup` in order to populate this automatically.

Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
thesentinels pushed a commit that referenced this pull request Jun 11, 2016
Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
thesentinels pushed a commit that referenced this pull request Jun 11, 2016
This change addresses 2 issues:

* The file that contains the cryptographic hashes to be stored in the
  `FILES` metadata file needs to be created under the source cache, not
  in the `$PLAN_CONTEXT` directory.
* The `$HAB_BIN` variable must be used throughout the program and not
  the `$_hab_cmd` variable, who's role has been downplayed.

References #725

Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
@thesentinels
Copy link
Contributor

☀️ Test successful - travis

@thesentinels thesentinels merged commit 1fd452d into master Jun 11, 2016
@fnichol fnichol deleted the fnichol/build-a-rama-june-2016-edition branch June 11, 2016 20:42
jtimberman pushed a commit that referenced this pull request Jun 12, 2016
This reverts commit 1703723.

Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
jtimberman pushed a commit that referenced this pull request Jun 12, 2016
This change adds the `core/unzip` package to the dependencies for
`core/hab-plan-build` (i.e. the "build" program) with the result that
`unzip` will be present on `$PATH` for Plan authors.

Adding a new dependency to the build toolchain also meant updating the
base build set. Additionally, as `core/bash-static` and
`core/coreutils-static` are no longer in the build toolchain critical
path (from the retirement of `hab-bpm`), these were dropped from the
base build set.

Closes #591

Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
jtimberman pushed a commit that referenced this pull request Jun 12, 2016
This will add `vi` onto a Plan author's `$PATH` if they are in an
interactive Studio.

Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
jtimberman pushed a commit that referenced this pull request Jun 12, 2016
This change fixes a mismatch argument value in the `hab pkg hash`
subcommand (`TARGET` vs. `SOURCE`).

Aditionally, the subcommand ordering the `cli.rs` and `main.rs` were
re-sorted in order to make the fake fuzzy matching code easier to manage
and to facilitate side-by-side viewing of the 2 source files.

Finally, the auth token parsing/lookup logic was refactored into a
function, similar to the origin parsing/lookup logic. This refactoring
adds an `auth_token` configuration value that can be set in a user's
`etc/cli.toml` configuration file. A later change may add an additional
question to the `hab cli setup` in order to populate this automatically.

Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
jtimberman pushed a commit that referenced this pull request Jun 12, 2016
Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
jtimberman pushed a commit that referenced this pull request Jun 12, 2016
This change addresses 2 issues:

* The file that contains the cryptographic hashes to be stored in the
  `FILES` metadata file needs to be created under the source cache, not
  in the `$PLAN_CONTEXT` directory.
* The `$HAB_BIN` variable must be used throughout the program and not
  the `$_hab_cmd` variable, who's role has been downplayed.

References #725

Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #743
Approved by: fnichol
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants