From 1e3e0f2a50c166a6385bb7caeabdf2a6f2b16d49 Mon Sep 17 00:00:00 2001 From: joneshf Date: Thu, 9 Aug 2018 21:58:03 -0700 Subject: [PATCH] Run everything in one job We want to start parameterizing jobs on the version of GHC. This is the first step. Should also make things quicker as there's no interleaving of jobs. --- .circleci/config.yml | 42 ++++-------------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 58899d1..3b12caf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2 jobs: - compile: + ghc-8.2.2: docker: - image: nixorg/nix:circleci steps: @@ -12,28 +12,13 @@ jobs: name: Restoring stack cache - run: name: Compile - command: nix-shell --run 'make build' - - persist_to_workspace: - root: . - paths: - - dist + command: nix-shell --run 'make sdist test -j2' - save_cache: key: v1-nix-{{ checksum "package.yaml" }} name: Caching nix paths: - /nix - doc-test: - docker: - - image: nixorg/nix:circleci - steps: - - checkout - - attach_workspace: - at: . - - run: - name: Doc test - command: nix-shell --run 'make test-doc-test' - for-github: docker: - image: alpine @@ -42,30 +27,11 @@ jobs: name: Passed command: echo passed - sdist: - docker: - - image: nixorg/nix:circleci - steps: - - checkout - - restore_cache: - keys: - - v1-nix-{{ checksum "package.yaml" }} - - v1-nix- - name: Restoring stack cache - - run: - name: Build sdist - command: nix-shell --run 'make sdist' - workflows: version: 2 base: jobs: - - compile - for-github: requires: - - doc-test - - sdist - - sdist - - doc-test: - requires: - - compile + - ghc-8.2.2 + - ghc-8.2.2