From dee88e841a6ea912491c2806b0c3ad61cd7f1207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 16 Feb 2020 10:24:08 +0000 Subject: [PATCH] remove gitlab build --- .gitlab-ci.yml | 69 -------------------------------------------------- nixos/up.sh | 1 + 2 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 2de1aab9..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,69 +0,0 @@ -.image: - before_script: - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com - script: - - docker pull $CONTAINER_IMAGE:latest || true - - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:latest ./$OS_NAME/ - - docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA - - docker push $CONTAINER_IMAGE:latest - stage: build - image: docker:stable - services: - - docker:dind - variables: - DOCKER_HOST: tcp://docker:2375/ - DOCKER_DRIVER: overlay2 - CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH/$OS_NAME - -image:fedora: - extends: .image - variables: - OS_NAME: fedora - -image:ubuntu: - extends: .image - variables: - OS_NAME: ubuntu - -.test: - before_script: - - apk add bash - script: ./test.sh - stage: test - image: docker:stable - services: - - docker:dind - variables: - DOCKER_HOST: tcp://docker:2375/ - DOCKER_DRIVER: overlay2 - DOCKER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH/$OS_NAME:$CI_COMMIT_SHA - -fedora:cached: - extends: .test - variables: - DETECTED_OS: fedora:30 - OS_NAME: fedora - dependencies: - - image:fedora - -ubuntu:cached: - extends: .test - variables: - DETECTED_OS: ubuntu:disco - OS_NAME: ubuntu - dependencies: - - image:ubuntu - -fedora:fresh: - extends: .test - variables: - DETECTED_OS: fedora:30 - OS_NAME: fedora - DOCKER_IMAGE: fedora:30 - -ubuntu:fresh: - extends: .test - variables: - DETECTED_OS: ubuntu:disco - OS_NAME: ubuntu - DOCKER_IMAGE: ubuntu:disco diff --git a/nixos/up.sh b/nixos/up.sh index e627731a..75881c79 100755 --- a/nixos/up.sh +++ b/nixos/up.sh @@ -43,6 +43,7 @@ nix-shell -p gcc pkgconfig zlib openssl --run "cargo install-update -a" set -e nix-shell -p gcc pkgconfig zlib openssl --run "rustup run nightly cargo install-update -a" +sudo nix-channel --add https://nixos.org/channels/nixos-19.09-small nixos nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager nix-channel --update nix-shell '' -A install