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:
parent
e58ed5052b
commit
6597ff1349
3 changed files with 15 additions and 10 deletions
15
.travis.sh
15
.travis.sh
|
@ -4,19 +4,20 @@
|
||||||
#
|
#
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
./build
|
|
||||||
|
|
||||||
# default to Docker Hub
|
# default to Docker Hub
|
||||||
# the user has to set REGISTRY_USER and REGISTRY_PASSWORD
|
# the user has to set REGISTRY_USER and REGISTRY_PASSWORD
|
||||||
: "${REGISTRY:=docker.io}"
|
: "${REGISTRY:=docker.io}"
|
||||||
: "${IMAGE_PREFIX:=nixpkgs}"
|
: "${IMAGE_PREFIX:=nixpkgs}"
|
||||||
|
|
||||||
# either pass those two or set the NIXPKGS_CHANNEL
|
# either set NIX_PATH and IMAGE_TAG, or set NIXPKGS_CHANNEL
|
||||||
: "${IMAGE_TAG:=$NIXPKGS_CHANNEL}"
|
if [[ -n "${NIXPKGS_CHANNEL:-}" ]]; then
|
||||||
: "${NIX_PATH:=nixpkgs=channel:$NIXPKGS_CHANNEL}"
|
: "${IMAGE_TAG:=$NIXPKGS_CHANNEL}"
|
||||||
export NIX_PATH
|
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"
|
./docker-login "$REGISTRY_USER" "$REGISTRY_PASSWORD" "$REGISTRY"
|
||||||
./push-all "$REGISTRY" "$IMAGE_PREFIX" "$IMAGE_TAG"
|
./push-all "$REGISTRY" "$IMAGE_PREFIX" "$IMAGE_TAG"
|
||||||
if [[ $REGISTRY = *docker.io ]]; then
|
if [[ $REGISTRY = *docker.io ]]; then
|
||||||
|
|
|
@ -6,10 +6,10 @@ matrix:
|
||||||
include:
|
include:
|
||||||
- name: nixos-unstable
|
- name: nixos-unstable
|
||||||
env: NIXPKGS_CHANNEL=nixos-unstable IMAGE_TAG=latest
|
env: NIXPKGS_CHANNEL=nixos-unstable IMAGE_TAG=latest
|
||||||
- name: nixos-19.03
|
|
||||||
env: NIXPKGS_CHANNEL=nixos-19.03
|
|
||||||
- name: nixos-19.09
|
- name: nixos-19.09
|
||||||
env: NIXPKGS_CHANNEL=nixos-19.09
|
env: NIXPKGS_CHANNEL=nixos-19.09
|
||||||
|
- name: nixos-19.03
|
||||||
|
env: NIXPKGS_CHANNEL=nixos-19.03
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- nix-shell --run ./.travis.sh
|
- nix-shell --run ./.travis.sh
|
||||||
|
|
|
@ -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 {
|
mkShell {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
jq
|
jq
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue