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.

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

nixos/buildkite-agent: fix variable expansion in hook scripts #38326

Merged
merged 1 commit into from Apr 27, 2018
Merged

nixos/buildkite-agent: fix variable expansion in hook scripts #38326

merged 1 commit into from Apr 27, 2018

Conversation

rvl
Copy link
Contributor

@rvl rvl commented Apr 2, 2018

Motivation for this change

@cleverca22 found this bug in the declarative hooks config. Any shell variables referenced in a hook script would get expanded by the hooks directory builder.

Prevent variable expansion by quoting the here doc limit string.

/cc @cleverca22 @zimbatm @domenkozar

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested manually by inspection of hooks directory.
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@rvl
nixos/buildkite-agent: fix variable expansion in hook scripts
5ec4a37 
@CleverCa found this bug in the declarative hooks config. Any shell
variables referenced in a hook script would get expanded by the hooks
directory builder.

Prevent variable expansion by quoting the here doc limit string.
zimbatm
zimbatm approved these changes Apr 2, 2018
View reviewed changes
Copy link
Member

@zimbatm zimbatm left a comment

Choose a reason for hiding this comment

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

looks good. This fix should also be ported to the 18.09 branch

@rvl rvl mentioned this pull request Apr 25, 2018
Merged
@domenkozar domenkozar merged commit 3e446ec into NixOS:master Apr 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimbatm zimbatm zimbatm approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@rvl @zimbatm @domenkozar @GrahamcOfBorg