Compare commits

..

1 Commits

Author SHA1 Message Date
c96782f220
Build .drone.yml with jsonnet instead of drone
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.
2020-10-15 19:32:29 +11:00
3 changed files with 94 additions and 107 deletions

@ -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" },
},
} }
] ]
}; };

@ -1,103 +1,91 @@
--- ---
{ kind: pipeline
"environment": { type: docker
"CACHIX_CACHE": "xeals", name: nixpkgs-unstable
"CACHIX_SIGNING_KEY": {
"from_secret": "cachix_key" platform:
}, os: linux
"NUR_REPO": "xeals" arch: amd64
},
"kind": "pipeline", steps:
"name": "nixpkgs-unstable", - name: build
"steps": [ image: nixos/nix
{ commands:
"commands": [ - nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixos
"nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixos", - nix-channel --update
"nix-channel --update", - nix-build ci.nix -A buildOutputs
"nix-build ci.nix -A buildOutputs", - nix eval -f default.nix 'lib'
"nix eval -f default.nix 'lib'", - nix eval -f default.nix 'modules'
"nix eval -f default.nix 'modules'", - nix eval -f default.nix 'overlays'
"nix eval -f default.nix 'overlays'"
], - name: deploy
"image": "nixos/nix", image: nixpkgs/cachix
"name": "build" commands:
}, - nix-build ci.nix -A cacheOutputs | cachix push "${CACHIX_CACHE}"
{ environment:
"commands": [ CACHIX_CACHE: xeals
"nix-build ci.nix -A cacheOutputs | cachix push \"${CACHIX_CACHE}\"" CACHIX_SIGNING_KEY:
], from_secret: cachix_key
"image": "nixpkgs/cachix", NUR_REPO: xeals
"name": "deploy"
}
],
"type": "docker"
}
--- ---
{ kind: pipeline
"environment": { type: docker
"CACHIX_CACHE": "xeals", name: nixos-unstable
"CACHIX_SIGNING_KEY": {
"from_secret": "cachix_key" platform:
}, os: linux
"NUR_REPO": "xeals" arch: amd64
},
"kind": "pipeline", steps:
"name": "nixos-unstable", - name: build
"steps": [ image: nixos/nix
{ commands:
"commands": [ - nix-channel --add https://nixos.org/channels/nixos-unstable nixos
"nix-channel --add https://nixos.org/channels/nixos-unstable nixos", - nix-channel --update
"nix-channel --update", - nix-build ci.nix -A buildOutputs
"nix-build ci.nix -A buildOutputs", - nix eval -f default.nix 'lib'
"nix eval -f default.nix 'lib'", - nix eval -f default.nix 'modules'
"nix eval -f default.nix 'modules'", - nix eval -f default.nix 'overlays'
"nix eval -f default.nix 'overlays'"
], - name: deploy
"image": "nixos/nix", image: nixpkgs/cachix
"name": "build" commands:
}, - nix-build ci.nix -A cacheOutputs | cachix push "${CACHIX_CACHE}"
{ environment:
"commands": [ CACHIX_CACHE: xeals
"nix-build ci.nix -A cacheOutputs | cachix push \"${CACHIX_CACHE}\"" CACHIX_SIGNING_KEY:
], from_secret: cachix_key
"image": "nixpkgs/cachix", NUR_REPO: xeals
"name": "deploy"
}
],
"type": "docker"
}
--- ---
{ kind: pipeline
"environment": { type: docker
"CACHIX_CACHE": "xeals", name: nixos-20.03
"CACHIX_SIGNING_KEY": {
"from_secret": "cachix_key" platform:
}, os: linux
"NUR_REPO": "xeals" arch: amd64
},
"kind": "pipeline", steps:
"name": "nixos-20.03", - name: build
"steps": [ image: nixos/nix
{ commands:
"commands": [ - nix-channel --add https://nixos.org/channels/nixos-20.03 nixos
"nix-channel --add https://nixos.org/channels/nixos-20.03 nixos", - nix-channel --update
"nix-channel --update", - nix-build ci.nix -A buildOutputs
"nix-build ci.nix -A buildOutputs", - nix eval -f default.nix 'lib'
"nix eval -f default.nix 'lib'", - nix eval -f default.nix 'modules'
"nix eval -f default.nix 'modules'", - nix eval -f default.nix 'overlays'
"nix eval -f default.nix 'overlays'"
], - name: deploy
"image": "nixos/nix", image: nixpkgs/cachix
"name": "build" commands:
}, - nix-build ci.nix -A cacheOutputs | cachix push "${CACHIX_CACHE}"
{ environment:
"commands": [ CACHIX_CACHE: xeals
"nix-build ci.nix -A cacheOutputs | cachix push \"${CACHIX_CACHE}\"" CACHIX_SIGNING_KEY:
], from_secret: cachix_key
"image": "nixpkgs/cachix", NUR_REPO: xeals
"name": "deploy"
}
],
"type": "docker"
}
... ...

@ -2,6 +2,6 @@
pkgs.mkShell { pkgs.mkShell {
buildInputs = [ buildInputs = [
pkgs.jsonnet pkgs.jsonnet pkgs.drone-cli
]; ];
} }