From 40694d62acd5ef24bc53adb73a610ad9832f48c3 Mon Sep 17 00:00:00 2001 From: Antoine Leblanc Date: Fri, 9 Apr 2021 21:03:25 +0100 Subject: [PATCH 1/2] Update references to old repo. --- README.markdown | 4 ++-- scripts/latest.sh | 2 +- scripts/stylish-haskell.sh | 2 +- stylish-haskell.cabal | 6 +++--- tests/Language/Haskell/Stylish/Step/Data/Tests.hs | 4 ++-- tests/Language/Haskell/Stylish/Step/Imports/FelixTests.hs | 7 ++++--- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.markdown b/README.markdown index 2a407e82..2b793344 100644 --- a/README.markdown +++ b/README.markdown @@ -37,7 +37,7 @@ You can also install it using your package manager: Feature requests are welcome! Use the [issue tracker] for that. -[issue tracker]: https://github.com/jaspervdj/stylish-haskell/issues +[issue tracker]: https://github.com/haskell/stylish-haskell/issues ## Example @@ -234,7 +234,7 @@ haskell-mode manual. You can quickly grab the latest binary and run `stylish-haskell` like so: - curl -sL https://raw.github.com/jaspervdj/stylish-haskell/master/scripts/latest.sh | sh -s . + curl -sL https://raw.github.com/haskell/stylish-haskell/master/scripts/latest.sh | sh -s . Where the `.` can be replaced with the arguments you pass to `stylish-haskell`. diff --git a/scripts/latest.sh b/scripts/latest.sh index b3e3760f..135cf173 100755 --- a/scripts/latest.sh +++ b/scripts/latest.sh @@ -6,7 +6,7 @@ set -e PACKAGE=stylish-haskell echo Downloading and running $PACKAGE... -RELEASES=$(curl --silent https://github.com/jaspervdj/$PACKAGE/releases) +RELEASES=$(curl --silent https://github.com/haskell/$PACKAGE/releases) URL=https://github.com/$(echo $RELEASES | grep -o '\"[^\"]*-linux-x86_64\.tar\.gz\"' | sed s/\"//g | head -n1) VERSION=$(echo $URL | sed -e 's/.*-\(v[\.0-9]\+-linux-x86_64\)\.tar\.gz/\1/') TEMP=$(mktemp --directory .$PACKAGE-XXXXX) diff --git a/scripts/stylish-haskell.sh b/scripts/stylish-haskell.sh index a22712e8..ddfe6ae6 100755 --- a/scripts/stylish-haskell.sh +++ b/scripts/stylish-haskell.sh @@ -1,4 +1,4 @@ #!/bin/sh # Ported from https://github.com/ndmitchell/hlint/blob/master/misc/travis.sh -curl -sL https://raw.github.com/jaspervdj/stylish-haskell/master/scripts/latest.sh | sh -s -- stylish-haskell $* +curl -sL https://raw.github.com/haskell/stylish-haskell/master/scripts/latest.sh | sh -s -- stylish-haskell $* diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal index 8e870f59..3dca4a40 100644 --- a/stylish-haskell.cabal +++ b/stylish-haskell.cabal @@ -2,7 +2,7 @@ Cabal-version: 2.4 Name: stylish-haskell Version: 0.12.2.0 Synopsis: Haskell code prettifier -Homepage: https://github.com/jaspervdj/stylish-haskell +Homepage: https://github.com/haskell/stylish-haskell License: BSD-3-Clause License-file: LICENSE Author: Jasper Van der Jeugt @@ -16,7 +16,7 @@ Description: . - + Extra-source-files: CHANGELOG, @@ -179,4 +179,4 @@ Test-suite stylish-haskell-tests Source-repository head Type: git - Location: https://github.com/jaspervdj/stylish-haskell + Location: https://github.com/haskell/stylish-haskell diff --git a/tests/Language/Haskell/Stylish/Step/Data/Tests.hs b/tests/Language/Haskell/Stylish/Step/Data/Tests.hs index 0f6444e1..aca2cb48 100644 --- a/tests/Language/Haskell/Stylish/Step/Data/Tests.hs +++ b/tests/Language/Haskell/Stylish/Step/Data/Tests.hs @@ -450,7 +450,7 @@ case19 = expected @=? testStep (step indentIndentStyle) input -- | Should not break Enums (data without records) formatting -- --- See https://github.com/jaspervdj/stylish-haskell/issues/262 +-- See https://github.com/haskell/stylish-haskell/issues/262 case20 :: Assertion case20 = input @=? testStep (step indentIndentStyle) input where @@ -1277,7 +1277,7 @@ case57 = assertSnippet (step defaultConfig) -- | Should not break DataKinds in records -- --- See https://github.com/jaspervdj/stylish-haskell/issues/330 +-- See https://github.com/haskell/stylish-haskell/issues/330 case58 :: Assertion case58 = expected @=? testStep (step sameIndentStyle) input where diff --git a/tests/Language/Haskell/Stylish/Step/Imports/FelixTests.hs b/tests/Language/Haskell/Stylish/Step/Imports/FelixTests.hs index 98c5d120..57931d02 100644 --- a/tests/Language/Haskell/Stylish/Step/Imports/FelixTests.hs +++ b/tests/Language/Haskell/Stylish/Step/Imports/FelixTests.hs @@ -1,15 +1,16 @@ -- | Tests contributed by Felix Mulder as part of --- . +-- . module Language.Haskell.Stylish.Step.Imports.FelixTests ( tests ) where -------------------------------------------------------------------------------- +import GHC.Stack (HasCallStack, + withFrozenCallStack) +import Prelude hiding (lines) import Test.Framework (Test, testGroup) import Test.Framework.Providers.HUnit (testCase) import Test.HUnit (Assertion) -import GHC.Stack (HasCallStack, withFrozenCallStack) -import Prelude hiding (lines) -------------------------------------------------------------------------------- import Language.Haskell.Stylish.Module From 370b515be01d82c5d8c43551bdbe765382db99e9 Mon Sep 17 00:00:00 2001 From: Pawel Szulc Date: Wed, 14 Apr 2021 14:23:09 +0200 Subject: [PATCH 2/2] bump the CI cache --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c89818d..26bb802a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: name: Cache ~/.stack with: path: ~/.stack - key: ${{ runner.os }}-${{ matrix.ghc }}-v6 + key: ${{ runner.os }}-${{ matrix.ghc }}-v7 - name: Add ~/.local/bin to PATH run: echo "$HOME/.local/bin" >> $GITHUB_PATH