Build .drone.yml with jsonnet instead of drone
Some checks failed
continuous-integration/drone/push Build is failing

The Drone tool completely ignores the environment key, because of course
it does. It seems the CLI tool has been abandoned for feature parity
here in favour of the built-in enterprise jsonnet parser, so guess we're
doing this.
This commit is contained in:
xeals 2020-10-15 19:19:49 +11:00
parent d985759753
commit c96782f220
Signed by: xeals
GPG Key ID: A498C7AF27EC6B5C
2 changed files with 21 additions and 7 deletions

View File

@ -2,12 +2,6 @@ local Pipeline(channel) = {
kind: "pipeline", kind: "pipeline",
type: "docker", type: "docker",
name: channel, name: channel,
environment: {
NUR_REPO: "xeals",
// NIX_PATH: "nixpkgs=channel:" + channel,
CACHIX_CACHE: "xeals",
CACHIX_SIGNING_KEY: { from_secret: "cachix_key" },
},
steps: [ steps: [
{ {
name: "build", name: "build",
@ -28,7 +22,12 @@ local Pipeline(channel) = {
'nix-build ci.nix -A cacheOutputs | cachix push "${CACHIX_CACHE}"'//, 'nix-build ci.nix -A cacheOutputs | cachix push "${CACHIX_CACHE}"'//,
// 'if [[ "cron" != "${DRONE_BUILD_EVENT}" && -z "${DRONE_PULL_REQUEST}" && "master" = "${DRONE_BRANCH}" ]]; then // 'if [[ "cron" != "${DRONE_BUILD_EVENT}" && -z "${DRONE_PULL_REQUEST}" && "master" = "${DRONE_BRANCH}" ]]; then
// curl -XPOST "https://nur-update.herokuapp.com/update?repo=${NUR_REPO}"; fi' // curl -XPOST "https://nur-update.herokuapp.com/update?repo=${NUR_REPO}"; fi'
] ],
environment: {
NUR_REPO: "xeals",
CACHIX_CACHE: "xeals",
CACHIX_SIGNING_KEY: { from_secret: "cachix_key" },
},
} }
] ]
}; };

View File

@ -22,6 +22,11 @@ steps:
image: nixpkgs/cachix image: nixpkgs/cachix
commands: commands:
- nix-build ci.nix -A cacheOutputs | cachix push "${CACHIX_CACHE}" - nix-build ci.nix -A cacheOutputs | cachix push "${CACHIX_CACHE}"
environment:
CACHIX_CACHE: xeals
CACHIX_SIGNING_KEY:
from_secret: cachix_key
NUR_REPO: xeals
--- ---
kind: pipeline kind: pipeline
@ -47,6 +52,11 @@ steps:
image: nixpkgs/cachix image: nixpkgs/cachix
commands: commands:
- nix-build ci.nix -A cacheOutputs | cachix push "${CACHIX_CACHE}" - nix-build ci.nix -A cacheOutputs | cachix push "${CACHIX_CACHE}"
environment:
CACHIX_CACHE: xeals
CACHIX_SIGNING_KEY:
from_secret: cachix_key
NUR_REPO: xeals
--- ---
kind: pipeline kind: pipeline
@ -72,5 +82,10 @@ steps:
image: nixpkgs/cachix image: nixpkgs/cachix
commands: commands:
- nix-build ci.nix -A cacheOutputs | cachix push "${CACHIX_CACHE}" - nix-build ci.nix -A cacheOutputs | cachix push "${CACHIX_CACHE}"
environment:
CACHIX_CACHE: xeals
CACHIX_SIGNING_KEY:
from_secret: cachix_key
NUR_REPO: xeals
... ...