Browse Source

Bump version, make release

tags/v0.2.4.0^0
Peter J. Jones 1 year ago
parent
commit
b93503e4b8
Signed by: Peter Jones <pjones@devalot.com> GPG Key ID: 9DAFAA8D01941E49
6 changed files with 74 additions and 56 deletions
  1. 0
    0
      .gitmodules
  2. 59
    45
      .travis.yml
  3. 4
    0
      CHANGES.md
  4. 1
    1
      LICENSE
  5. 9
    9
      vimeta.cabal
  6. 1
    1
      vimeta.nix

+ 0
- 0
.gitmodules View File


+ 59
- 45
.travis.yml View File

@@ -1,6 +1,6 @@
1 1
 # This Travis job script has been generated by a script via
2 2
 #
3
-#   make_travis_yml_2.hs 'vimeta.cabal'
3
+#   runghc make_travis_yml_2.hs 'vimeta.cabal'
4 4
 #
5 5
 # For more information, see https://github.com/hvr/multi-ghc-travis
6 6
 #
@@ -24,64 +24,78 @@ before_cache:
24 24
   - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
25 25
   - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
26 26
 
27
+  - rm -rfv $HOME/.cabal/packages/head.hackage
28
+
27 29
 matrix:
28 30
   include:
29
-    - compiler: "ghc-7.8.4"
30
-    # env: TEST=--disable-tests BENCH=--disable-benchmarks
31
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
32 31
     - compiler: "ghc-7.10.3"
33 32
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
34 33
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
35
-    - compiler: "ghc-8.0.1"
34
+    - compiler: "ghc-8.0.2"
35
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
36
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
37
+    - compiler: "ghc-8.2.2"
36 38
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
37
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.1], sources: [hvr-ghc]}}
39
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
38 40
 
39 41
 before_install:
40
- - HC=${CC}
41
- - unset CC
42
- - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
43
- - PKGNAME='vimeta'
42
+  - HC=${CC}
43
+  - HCPKG=${HC/ghc/ghc-pkg}
44
+  - unset CC
45
+  - ROOTDIR=$(pwd)
46
+  - mkdir -p $HOME/.local/bin
47
+  - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
48
+  - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
49
+  - echo $HCNUMVER
44 50
 
45 51
 install:
46
- - cabal --version
47
- - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
48
- - BENCH=${BENCH---enable-benchmarks}
49
- - TEST=${TEST---enable-tests}
50
- - travis_retry cabal update -v
51
- - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
52
- - rm -fv cabal.project.local
53
- - "echo 'packages: .' > cabal.project"
54
- - rm -f cabal.project.freeze
55
- - cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all
56
- - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all
52
+  - cabal --version
53
+  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
54
+  - BENCH=${BENCH---enable-benchmarks}
55
+  - TEST=${TEST---enable-tests}
56
+  - HADDOCK=${HADDOCK-true}
57
+  - INSTALLED=${INSTALLED-true}
58
+  - GHCHEAD=${GHCHEAD-false}
59
+  - travis_retry cabal update -v
60
+  - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
61
+  - rm -fv cabal.project cabal.project.local
62
+  - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
63
+  - "printf 'packages: \".\"\\n' > cabal.project"
64
+  - cat cabal.project
65
+  - if [ -f "./configure.ac" ]; then
66
+      (cd "." && autoreconf -i);
67
+    fi
68
+  - rm -f cabal.project.freeze
69
+  - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
70
+  - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
71
+  - rm -rf .ghc.environment.* "."/dist
72
+  - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
57 73
 
58 74
 # Here starts the actual work to be performed for the package under test;
59 75
 # any command which exits with a non-zero exit code causes the build to fail.
60 76
 script:
61
- - if [ -f configure.ac ]; then autoreconf -i; fi
62
- - rm -rf dist/
63
- - cabal sdist # test that a source-distribution can be generated
64
- - cd dist/
65
- - SRCTAR=(${PKGNAME}-*.tar.gz)
66
- - SRC_BASENAME="${SRCTAR/%.tar.gz}"
67
- - tar -xvf "./$SRC_BASENAME.tar.gz"
68
- - cd "$SRC_BASENAME/"
69
-## from here on, CWD is inside the extracted source-tarball
70
- - rm -fv cabal.project.local
71
- - "echo 'packages: .' > cabal.project"
72
- # this builds all libraries and executables (without tests/benchmarks)
73
- - rm -f cabal.project.freeze
74
- - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
75
- # this builds all libraries and executables (including tests/benchmarks)
76
- # - rm -rf ./dist-newstyle
77
- - cabal new-build -w ${HC} ${TEST} ${BENCH} all
77
+  # test that source-distributions can be generated
78
+  - (cd "." && cabal sdist)
79
+  - mv "."/dist/vimeta-*.tar.gz ${DISTDIR}/
80
+  - cd ${DISTDIR} || false
81
+  - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
82
+  - "printf 'packages: vimeta-*/*.cabal\\n' > cabal.project"
83
+  - cat cabal.project
84
+  # this builds all libraries and executables (without tests/benchmarks)
85
+  - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
86
+
87
+  # Build with installed constraints for packages in global-db
88
+  - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
89
+
90
+  # build & run tests, build benchmarks
91
+  - cabal new-build -w ${HC} ${TEST} ${BENCH} all
92
+
93
+  # cabal check
94
+  - (cd vimeta-* && cabal check)
78 95
 
79
- # there's no 'cabal new-test' yet, so let's emulate for now
80
- - TESTS=( $(awk 'tolower($0) ~ /^test-suite / { print $2 }' *.cabal) )
81
- - if [ "$TEST" != "--enable-tests" ]; then TESTS=(); fi
82
- - shopt -s globstar;
83
-   RC=true; for T in ${TESTS[@]}; do echo "== $T ==";
84
-   if dist-newstyle/build/**/$SRC_BASENAME/**/build/$T/$T; then echo "= $T OK =";
85
-   else echo "= $T FAILED ="; RC=false; fi; done; $RC
96
+  # haddock
97
+  - rm -rf ./dist-newstyle
98
+  - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
86 99
 
100
+# REGENDATA ["vimeta.cabal"]
87 101
 # EOF

+ 4
- 0
CHANGES.md View File

@@ -1,5 +1,9 @@
1 1
 # Version History
2 2
 
3
+## 0.2.4.0 (March 20, 2018)
4
+
5
+  - Update dependency versions
6
+
3 7
 ## 0.2.3.0 (March 19, 2017)
4 8
 
5 9
   - Update dependency versions

+ 1
- 1
LICENSE View File

@@ -1,4 +1,4 @@
1
-Copyright (c) 2013-2017 Peter J. Jones <pjones@devalot.com>
1
+Copyright (c) 2013-2018 Peter J. Jones <pjones@devalot.com>
2 2
 All rights reserved.
3 3
 
4 4
 Redistribution and use in source and binary forms, with or without

+ 9
- 9
vimeta.cabal View File

@@ -8,12 +8,12 @@ license:       BSD2
8 8
 license-file:  LICENSE
9 9
 author:        Peter Jones <pjones@devalot.com>
10 10
 maintainer:    Peter Jones <pjones@devalot.com>
11
-copyright:     Copyright (c) 2013-2017 Peter Jones
11
+copyright:     Copyright (c) 2013-2018 Peter Jones
12 12
 category:      Video
13 13
 stability:     experimental
14
-tested-with:   GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1
14
+tested-with:   GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2
15 15
 build-type:    Simple
16
-cabal-version: >=1.10
16
+cabal-version: 1.18
17 17
 description:
18 18
   Vimeta is a tool to fetch video metadata from the interwebs and
19 19
   update video files using a tagging tool.
@@ -69,26 +69,26 @@ library
69 69
   if flag(maintainer)
70 70
     ghc-options: -Werror
71 71
 
72
-  build-depends: aeson                >= 0.8    && < 1.2
73
-               , base                 >= 4.6    && < 5.0
72
+  build-depends: base                 >= 4.6    && < 5.0
73
+               , aeson                >= 0.8    && < 1.4
74 74
                , byline               >= 0.1    && < 1.0
75 75
                , bytestring           >= 0.10   && < 0.11
76 76
                , containers           >= 0.5    && < 0.6
77 77
                , directory            >= 1.2    && < 1.4
78
-               , either               >= 4.3    && < 4.5
78
+               , either               >= 4.3    && < 6
79 79
                , filepath             >= 1.3    && < 1.5
80 80
                , http-client          >= 0.4.30 && < 0.6
81 81
                , http-client-tls      >= 0.2.2  && < 0.4
82
-               , http-types           >= 0.8    && < 0.10
82
+               , http-types           >= 0.8    && < 0.13
83 83
                , mtl                  >= 2.1    && < 2.3
84 84
                , old-locale           >= 1.0    && < 1.1
85
-               , optparse-applicative >= 0.11   && < 0.14
85
+               , optparse-applicative >= 0.11   && < 0.15
86 86
                , parsec               >= 3.1    && < 3.2
87 87
                , process              >= 1.1    && < 1.7
88 88
                , temporary            >= 1.1    && < 1.3
89 89
                , text                 >= 0.11   && < 1.3
90 90
                , themoviedb           >= 1.1    && < 1.2
91
-               , time                 >= 1.2    && < 1.9
91
+               , time                 >= 1.2    && < 1.10
92 92
                , time-locale-compat   >= 0.1    && < 0.2
93 93
                , transformers         >= 0.3    && < 0.6
94 94
                , xdg-basedir          >= 0.2    && < 0.3

+ 1
- 1
vimeta.nix View File

@@ -6,7 +6,7 @@
6 6
 }:
7 7
 mkDerivation {
8 8
   pname = "vimeta";
9
-  version = "0.2.3.0";
9
+  version = "0.2.4.0";
10 10
   src = ./.;
11 11
   isLibrary = true;
12 12
   isExecutable = true;

Loading…
Cancel
Save