NexVeridian/docker-nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

ci: add the NIXPKGS_CHANNEL shortcut

Browse source
This commit is contained in:
zimbatm 2019-12-20 17:16:21 +01:00
parent 9f61ec7d27
commit 7ed6a50917
No known key found for this signature in database
GPG key ID: 71BAF6D40C1D63D7
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -7,19 +7,17 @@ nixos-unstable:
stage: build stage: build
script: nix-shell --run ./.gitlab-ci.sh script: nix-shell --run ./.gitlab-ci.sh
variables: variables:
NIX_PATH: nixpkgs=channel:nixos-unstable NIXPKGS_CHANNEL: nixos-unstable
IMAGE_TAG: latest IMAGE_TAG: latest
nixos-19.03: nixos-19.03:
stage: build stage: build
script: nix-shell --run ./.gitlab-ci.sh script: nix-shell --run ./.gitlab-ci.sh
variables: variables:
NIX_PATH: nixpkgs=channel:nixos-19.03 NIXPKGS_CHANNEL: nixos-19.03
IMAGE_TAG: nixos-19.03
nixos-19.09: nixos-19.09:
stage: build stage: build
script: nix-shell --run ./.gitlab-ci.sh script: nix-shell --run ./.gitlab-ci.sh
variables: variables:
NIX_PATH: nixpkgs=channel:nixos-19.09 NIXPKGS_CHANNEL: nixos-19.09
IMAGE_TAG: nixos-19.09

8
.travis.sh
View file

@ -7,12 +7,14 @@ set -euo pipefail
./build ./build
# default to Docker Hub # default to Docker Hub
# the user has to set REGISTRY_USER and REGISTRY_PASSWORD
: "${REGISTRY:=docker.io}" : "${REGISTRY:=docker.io}"
: "${IMAGE_PREFIX:=nixpkgs}" : "${IMAGE_PREFIX:=nixpkgs}"
# IMAGE_TAG is provided by .travis.yml # either pass those two or set the NIXPKGS_CHANNEL
: "${IMAGE_TAG:=$NIXPKGS_CHANNEL}"
# the user has to set REGISTRY_USER and REGISTRY_PASSWORD : "${NIX_PATH:=nixpkgs=channel:$NIXPKGS_CHANNEL}"
export NIX_PATH
if [[ "$TRAVIS_BRANCH" = master && -z "$TRAVIS_PULL_REQUEST_BRANCH" ]]; then if [[ "$TRAVIS_BRANCH" = master && -z "$TRAVIS_PULL_REQUEST_BRANCH" ]]; then
./docker-login "$REGISTRY_USER" "$REGISTRY_PASSWORD" "$REGISTRY" ./docker-login "$REGISTRY_USER" "$REGISTRY_PASSWORD" "$REGISTRY"

6
.travis.yml
View file

@ -5,11 +5,11 @@ nix: 2.2.1
matrix: matrix:
include: include:
- name: nixos-unstable - name: nixos-unstable
env: NIX_PATH=nixpkgs=channel:nixos-unstable IMAGE_TAG=latest env: NIXPKGS_CHANNEL=nixos-unstable IMAGE_TAG=latest
- name: nixos-19.03 - name: nixos-19.03
env: NIX_PATH=nixpkgs=channel:nixos-19.03 IMAGE_TAG=nixos-19.03 env: NIXPKGS_CHANNEL=nixos-19.03
- name: nixos-19.09 - name: nixos-19.09
env: NIX_PATH=nixpkgs=channel:nixos-19.09 IMAGE_TAG=nixos-19.09 env: NIXPKGS_CHANNEL=nixos-19.09
script: script:
- nix-shell --run ./.travis.sh - nix-shell --run ./.travis.sh