Skip to content
This repository was archived by the owner on Jun 17, 2020. It is now read-only.

Buildkite: fix NIX_PATH and add deployment key for haskell.nix #549

Merged
iohk-bors merged 2 commits into from
Mar 21, 2019
Merged

Buildkite: fix NIX_PATH and add deployment key for haskell.nix #549

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67cf6bd
Buildkite: Allow pipelines to override NIX_PATH
rvl Mar 20, 2019
9e37d26
Buildkite: Add a deployment key for haskell.nix documentation
rvl Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion modules/buildkite-agent.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ in
# Provide a minimal build environment
export NIX_BUILD_SHELL="/run/current-system/sw/bin/bash"
export PATH="/run/current-system/sw/bin:$PATH"
export NIX_PATH="nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"

# Provide NIX_PATH, unless it's already set by the pipeline
if [ -z "$NIX_PATH" ]; then
# see iohk-ops/modules/common.nix (system.extraSystemBuilderCmds)
export NIX_PATH="nixpkgs=/run/current-system/nixpkgs"
fi

# load S3 credentials for artifact upload
source /var/lib/buildkite-agent/hooks/aws-creds
Expand Down Expand Up @@ -91,6 +96,13 @@ in
user = "buildkite-agent";
};

# GitHub deploy key for input-output-hk/haskell.nix
# (used to update gh-pages documentation)
buildkite-haskell-dot-nix-ssh-private = {
keyFile = ./. + "/../static/buildkite-haskell-dot-nix-ssh";
user = "buildkite-agent";
};

# API Token for BuildKite
buildkite-token = {
keyFile = ./. + "/../static/buildkite_token";
Expand Down