ci: fix Travis CI builds

* run the ./build after setting the NIX_PATH. Previously the images
  were always generate with the system channel. Oops!
* pin the outer shell version to nixos-19.09. skopeo broke in unstable.
  also we don't need to force the system here, technically this could
  run on macOS.
This commit is contained in:
zimbatm 2020-02-09 16:23:27 +01:00
parent e58ed5052b
commit 6597ff1349
No known key found for this signature in database
GPG key ID: 71BAF6D40C1D63D7
3 changed files with 15 additions and 10 deletions

View file

@ -4,19 +4,20 @@
#
set -euo pipefail
./build
# default to Docker Hub
# the user has to set REGISTRY_USER and REGISTRY_PASSWORD
: "${REGISTRY:=docker.io}"
: "${IMAGE_PREFIX:=nixpkgs}"
# either pass those two or set the NIXPKGS_CHANNEL
: "${IMAGE_TAG:=$NIXPKGS_CHANNEL}"
: "${NIX_PATH:=nixpkgs=channel:$NIXPKGS_CHANNEL}"
export NIX_PATH
# either set NIX_PATH and IMAGE_TAG, or set NIXPKGS_CHANNEL
if [[ -n "${NIXPKGS_CHANNEL:-}" ]]; then
: "${IMAGE_TAG:=$NIXPKGS_CHANNEL}"
export NIX_PATH=nixpkgs=channel:$NIXPKGS_CHANNEL
fi
if [[ "$TRAVIS_BRANCH" = master && -z "$TRAVIS_PULL_REQUEST_BRANCH" ]]; then
./build
if [[ "$TRAVIS_BRANCH" = master && -z "${TRAVIS_PULL_REQUEST_BRANCH:-}" ]]; then
./docker-login "$REGISTRY_USER" "$REGISTRY_PASSWORD" "$REGISTRY"
./push-all "$REGISTRY" "$IMAGE_PREFIX" "$IMAGE_TAG"
if [[ $REGISTRY = *docker.io ]]; then

View file

@ -6,10 +6,10 @@ matrix:
include:
- name: nixos-unstable
env: NIXPKGS_CHANNEL=nixos-unstable IMAGE_TAG=latest
- name: nixos-19.03
env: NIXPKGS_CHANNEL=nixos-19.03
- name: nixos-19.09
env: NIXPKGS_CHANNEL=nixos-19.09
- name: nixos-19.03
env: NIXPKGS_CHANNEL=nixos-19.03
script:
- nix-shell --run ./.travis.sh

View file

@ -1,4 +1,8 @@
with import ./pkgs.nix;
let
nixpkgs = builtins.fetchTarball "channel:nixos-19.09";
pkgs = import nixpkgs { config = {}; overlays = []; };
in
with pkgs;
mkShell {
buildInputs = [
jq