Use Cabal build, add options

arbor · Mar 25, 2019 · f69fd57 · f69fd57
1 parent 184ba06
commit f69fd57
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 305 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,172 +1,41 @@
+version: 2.1
 
-cabalbuild: &cabalbuild
-  working_directory: ~/project
+orbs:
+  haskell: haskell-works/haskell-build@1.6.3
+  github: haskell-works/github-release@1.2.1
+  hackage: haskell-works/hackage@1.0.0
 
-  steps:
-    - checkout
-
-    - run:
-        name: Add GHC tools to PATH
-        command: |
-          echo "HOME=$HOME"
-          echo "BASH_ENV=$BASH_ENV"
-          echo "PATH=$PATH"
-          echo 'export PATH="$PATH:/opt/ghc/bin/"' >> $BASH_ENV
-
-    - run:
-        name: Copying scripts
-        command: |
-          mkdir -p ~/.local/bin
-          cp ./scripts/* ~/.local/bin
-
-    - run:
-        name: GHC version
-        command: |
-          echo "$GHC" > ghc.version
-          date +%Y-%m > month.version
-
-    - run:
-        name: Find all sub-projects
-        command: ./scripts/projects-summary > projects.summary
-
-    ##### Building library
-    - restore_cache:
-        keys:
-          - cabal--{{ checksum "ghc.version" }}--{{ .Environment.CACHE_VERSION }}--{{ checksum "projects.summary" }}--extra
-          - cabal--{{ checksum "ghc.version" }}--{{ .Environment.CACHE_VERSION }}--{{ checksum "projects.summary" }}--
-          - cabal--{{ checksum "ghc.version" }}--{{ .Environment.CACHE_VERSION }}--{{ checksum "month.version"}}
-
-    - run:
-        name: Building build dependencies
-        command: |
-          ./scripts/mk-cabal-project > cabal.project
-          cabal update
-          cabal new-build --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j${CABAL_THREADS:-4} all
-          cabal new-build --enable-tests  --enable-benchmarks  --project-file="cabal.project" --dep -j${CABAL_THREADS:-4} all
-
-    - save_cache:
-        key:    cabal--{{ checksum "ghc.version" }}--{{ .Environment.CACHE_VERSION }}--{{ checksum "projects.summary" }}--
-        paths:  [~/.cabal/packages, ~/.cabal/store]
-
-    - run:
-        name: Building project
-        command: |
-          cabal new-build --enable-tests --enable-benchmarks --project-file="cabal.project" -j${CABAL_THREADS:-4} all
-
-    - save_cache:
-        key:    cabal--{{ checksum "ghc.version" }}--{{ .Environment.CACHE_VERSION }}--{{ checksum "projects.summary" }}--extra
-        paths:  [~/.cabal/packages, ~/.cabal/store]
-
-    - save_cache:
-        key:    cabal--{{ checksum "ghc.version" }}--{{ .Environment.CACHE_VERSION }}--{{ checksum "month.version"}}
-        paths:  [~/.cabal/packages, ~/.cabal/store]
-
-    - run:
-        name: Running tests
-        command: |
-          if grep '^test-suite' *.cabal > /dev/null; then
-            cabal new-test --project-file="cabal.project" -j${CABAL_THREADS:-4} all
-          else
-            echo Not tests to run
-          fi
-
-version: 2.0
-jobs:
-  ghc-8.4.3:
-    environment:
-      - GHC: "ghc8.4.3"
-    docker:
-      - image: quay.io/haskell_works/ghc-8.4.3:18.04_2018-09-24
-    <<: *cabalbuild
-
-  ghc-8.2.2:
-    environment:
-      - GHC: "ghc8.2.2"
-    docker:
-      - image: quay.io/haskell_works/ghc-8.2.2:18.04_2018-09-24
-    <<: *cabalbuild
-
-  checked-builds:
-    docker:
-      - image: quay.io/haskell_works/ghc-8.4.3:18.04_2018-09-24
-
-    steps:
-      - checkout
-
-      - run:
-          name: Add GHC tools to PATH
-          command: |
-            echo "HOME=$HOME"
-            echo "BASH_ENV=$BASH_ENV"
-            echo "PATH=$PATH"
-            echo 'export PATH="$PATH:/opt/ghc/bin/"' >> $BASH_ENV
-
-      - run:
-          name: Copying scripts
-          command: |
-            mkdir -p ~/.local/bin
-            cp ./scripts/* ~/.local/bin
-
-      - deploy:
-          command: |
-            if [ "$CIRCLE_PROJECT_USERNAME" == "arbor" ]; then
-              if [[ "$CIRCLE_BRANCH" == master ]]; then
-                when tag autotag
-              elif [[ "$CIRCLE_TAG" =~ v.* ]]; then
-                publish
-              fi
-            fi
-
-  release:
-    docker:
-      - image: quay.io/haskell_works/ghc-8.4.3:18.04_2018-09-24
-
-    steps:
-      - checkout
+workflows:
+  multiple-ghc-build:
+    jobs:
+      - haskell/build:
+          name: GHC 8.2.2
+          executor: haskell/ghc-8_2_2
 
-      - run:
-          name: Add GHC tools to PATH
-          command: |
-            echo "HOME=$HOME"
-            echo "BASH_ENV=$BASH_ENV"
-            echo "PATH=$PATH"
-            echo 'export PATH="$PATH:/opt/ghc/bin/"' >> $BASH_ENV
+      - haskell/build:
+          name: GHC 8.4.4
+          executor: haskell/ghc-8_4_4
 
-      - run:
-          name: Copying scripts
-          command: |
-            mkdir -p ~/.local/bin
-            cp ./scripts/* ~/.local/bin
+      - haskell/build:
+          name: GHC 8.6.3
+          executor: haskell/ghc-8_6_3
 
-      - deploy:
-          command: |
-            if [ "$CIRCLE_PROJECT_USERNAME" == "arbor" ]; then
-              if [[ "$CIRCLE_BRANCH" == master ]]; then
-                when tag autotag
-              elif [[ "$CIRCLE_TAG" =~ v.* ]]; then
-                publish
-              fi
-            fi
-  
-workflows:
-  version: 2
-  multiple-ghcs:
-    jobs:
-      - ghc-8.4.3
-      - ghc-8.2.2
-      - checked-builds:
+      - github/release-cabal:
+          name: GitHub Release
+          context: haskell-ci
           requires:
-            - ghc-8.4.3
-            - ghc-8.2.2
+            - GHC 8.2.2
+            - GHC 8.4.4
+            - GHC 8.6.3
+          checkout: true
           filters:
             branches:
               only: master
 
-  tagged-release:
-    jobs:
-      - release:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
+      - hackage/upload:
+          context: haskell-ci
+          publish: true
+          requires:
+            - GitHub Release
+          username: ${HACKAGE_USER}
+          password: ${HACKAGE_PASS}
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-# Created by http://www.gitignore.io
-
 ### OSX ###
 .DS_Store
 *.DS_Store
@@ -12,15 +10,15 @@ Icon
 # Thumbnails
 ._*
 
-docker/rdkafka/
-
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
 
 ### Haskell ###
-dist
+dist/
+dist-newstyle/
 cabal-dev
+.ghc.environment*
 *.o
 *.hi
 *.chi
@@ -30,6 +28,7 @@ cabal-dev
 .cabal-sandbox/
 cabal.sandbox.config
 cabal.config
+cabal.project.local
 .stack-work/
 *.aux
 *.ps
@@ -61,19 +60,3 @@ tramp
 # elpa packages
 /elpa/
 TAGS
-
-## Python
-.idea
-
-/state
-
-*.ipynb
-__pycache*
-
-# transient librdkafka
-.librdkafka
-
-/dist-newstyle
-/.ghc.environment.x86_64-darwin-*
-/cabal.project.local
-