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 @@
# This Travis job script has been generated by a script via
#
# make_travis_yml_2.hs 'vimeta.cabal'
# runghc make_travis_yml_2.hs 'vimeta.cabal'
#
# For more information, see https://github.com/hvr/multi-ghc-travis
#
@@ -24,64 +24,78 @@ before_cache:
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx

- rm -rfv $HOME/.cabal/packages/head.hackage

matrix:
include:
- compiler: "ghc-7.8.4"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
- compiler: "ghc-7.10.3"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
- compiler: "ghc-8.0.1"
- compiler: "ghc-8.0.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
- compiler: "ghc-8.2.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.1], sources: [hvr-ghc]}}
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}

before_install:
- HC=${CC}
- unset CC
- PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
- PKGNAME='vimeta'
- HC=${CC}
- HCPKG=${HC/ghc/ghc-pkg}
- unset CC
- ROOTDIR=$(pwd)
- mkdir -p $HOME/.local/bin
- "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
- echo $HCNUMVER

install:
- cabal --version
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
- BENCH=${BENCH---enable-benchmarks}
- TEST=${TEST---enable-tests}
- travis_retry cabal update -v
- sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- rm -fv cabal.project.local
- "echo 'packages: .' > cabal.project"
- rm -f cabal.project.freeze
- cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all
- cabal --version
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
- BENCH=${BENCH---enable-benchmarks}
- TEST=${TEST---enable-tests}
- HADDOCK=${HADDOCK-true}
- INSTALLED=${INSTALLED-true}
- GHCHEAD=${GHCHEAD-false}
- travis_retry cabal update -v
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
- rm -fv cabal.project cabal.project.local
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
- "printf 'packages: \".\"\\n' > cabal.project"
- cat cabal.project
- if [ -f "./configure.ac" ]; then
(cd "." && autoreconf -i);
fi
- rm -f cabal.project.freeze
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
- rm -rf .ghc.environment.* "."/dist
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

# Here starts the actual work to be performed for the package under test;
# any command which exits with a non-zero exit code causes the build to fail.
script:
- if [ -f configure.ac ]; then autoreconf -i; fi
- rm -rf dist/
- cabal sdist # test that a source-distribution can be generated
- cd dist/
- SRCTAR=(${PKGNAME}-*.tar.gz)
- SRC_BASENAME="${SRCTAR/%.tar.gz}"
- tar -xvf "./$SRC_BASENAME.tar.gz"
- cd "$SRC_BASENAME/"
## from here on, CWD is inside the extracted source-tarball
- rm -fv cabal.project.local
- "echo 'packages: .' > cabal.project"
# this builds all libraries and executables (without tests/benchmarks)
- rm -f cabal.project.freeze
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
# this builds all libraries and executables (including tests/benchmarks)
# - rm -rf ./dist-newstyle
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
# test that source-distributions can be generated
- (cd "." && cabal sdist)
- mv "."/dist/vimeta-*.tar.gz ${DISTDIR}/
- cd ${DISTDIR} || false
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
- "printf 'packages: vimeta-*/*.cabal\\n' > cabal.project"
- cat cabal.project
# this builds all libraries and executables (without tests/benchmarks)
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all

# Build with installed constraints for packages in global-db
- 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

# build & run tests, build benchmarks
- cabal new-build -w ${HC} ${TEST} ${BENCH} all

# cabal check
- (cd vimeta-* && cabal check)

# there's no 'cabal new-test' yet, so let's emulate for now
- TESTS=( $(awk 'tolower($0) ~ /^test-suite / { print $2 }' *.cabal) )
- if [ "$TEST" != "--enable-tests" ]; then TESTS=(); fi
- shopt -s globstar;
RC=true; for T in ${TESTS[@]}; do echo "== $T ==";
if dist-newstyle/build/**/$SRC_BASENAME/**/build/$T/$T; then echo "= $T OK =";
else echo "= $T FAILED ="; RC=false; fi; done; $RC
# haddock
- rm -rf ./dist-newstyle
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi

# REGENDATA ["vimeta.cabal"]
# EOF

+ 4
- 0
CHANGES.md View File

@@ -1,5 +1,9 @@
# Version History

## 0.2.4.0 (March 20, 2018)

- Update dependency versions

## 0.2.3.0 (March 19, 2017)

- Update dependency versions

+ 1
- 1
LICENSE View File

@@ -1,4 +1,4 @@
Copyright (c) 2013-2017 Peter J. Jones <pjones@devalot.com>
Copyright (c) 2013-2018 Peter J. Jones <pjones@devalot.com>
All rights reserved.

Redistribution and use in source and binary forms, with or without

+ 9
- 9
vimeta.cabal View File

@@ -8,12 +8,12 @@ license: BSD2
license-file: LICENSE
author: Peter Jones <pjones@devalot.com>
maintainer: Peter Jones <pjones@devalot.com>
copyright: Copyright (c) 2013-2017 Peter Jones
copyright: Copyright (c) 2013-2018 Peter Jones
category: Video
stability: experimental
tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1
tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2
build-type: Simple
cabal-version: >=1.10
cabal-version: 1.18
description:
Vimeta is a tool to fetch video metadata from the interwebs and
update video files using a tagging tool.
@@ -69,26 +69,26 @@ library
if flag(maintainer)
ghc-options: -Werror

build-depends: aeson >= 0.8 && < 1.2
, base >= 4.6 && < 5.0
build-depends: base >= 4.6 && < 5.0
, aeson >= 0.8 && < 1.4
, byline >= 0.1 && < 1.0
, bytestring >= 0.10 && < 0.11
, containers >= 0.5 && < 0.6
, directory >= 1.2 && < 1.4
, either >= 4.3 && < 4.5
, either >= 4.3 && < 6
, filepath >= 1.3 && < 1.5
, http-client >= 0.4.30 && < 0.6
, http-client-tls >= 0.2.2 && < 0.4
, http-types >= 0.8 && < 0.10
, http-types >= 0.8 && < 0.13
, mtl >= 2.1 && < 2.3
, old-locale >= 1.0 && < 1.1
, optparse-applicative >= 0.11 && < 0.14
, optparse-applicative >= 0.11 && < 0.15
, parsec >= 3.1 && < 3.2
, process >= 1.1 && < 1.7
, temporary >= 1.1 && < 1.3
, text >= 0.11 && < 1.3
, themoviedb >= 1.1 && < 1.2
, time >= 1.2 && < 1.9
, time >= 1.2 && < 1.10
, time-locale-compat >= 0.1 && < 0.2
, transformers >= 0.3 && < 0.6
, xdg-basedir >= 0.2 && < 0.3

+ 1
- 1
vimeta.nix View File

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

Loading…
Cancel
Save