parent
							
								
									9f4426a462
								
							
						
					
					
						commit
						36af23ff5a
					
				| @ -69,12 +69,12 @@ install: | |||||||
| # | # | ||||||
| # install ghc | # install ghc | ||||||
| #- stack setup | #- stack setup | ||||||
| # use ghc 8.2 to avoid a hledger-web -> network/stack build issue on windows, | # use ghc 8.2 to avoid hledger-web -> network/stack/ghc/windows build issue | ||||||
| # network 2.7.0.1 should work around it when released |  | ||||||
| # https://github.com/haskell/network/issues/313 | # https://github.com/haskell/network/issues/313 | ||||||
| # https://github.com/commercialhaskell/stack/issues/3944 | # https://github.com/commercialhaskell/stack/issues/3944 | ||||||
| #- stack --stack-yaml=stack-ghc8.2.yaml setup | # network 2.7.0.1 is supposed to work around it | ||||||
| - stack setup | - stack setup --stack-yaml=stack-ghc8.2.yaml  | ||||||
|  | #- stack setup | ||||||
| #- set PATH=C:\Users\appveyor\AppData\Roaming\local\bin;%PATH% | #- set PATH=C:\Users\appveyor\AppData\Roaming\local\bin;%PATH% | ||||||
| #- stack install shelltestrunner | #- stack install shelltestrunner | ||||||
| 
 | 
 | ||||||
| @ -83,9 +83,11 @@ install: | |||||||
| # hledger-ui's vty dep isn't available on windows | # hledger-ui's vty dep isn't available on windows | ||||||
| # hledger-api not tried recently  | # hledger-api not tried recently  | ||||||
| build_script: | build_script: | ||||||
| #- stack build --test --copy-bins --local-bin-path=. hledger hledger-web |  | ||||||
| # use network 2.7.0.1+ to avoid https://github.com/haskell/network/issues/313 | # use network 2.7.0.1+ to avoid https://github.com/haskell/network/issues/313 | ||||||
| - stack build --test --copy-bins --local-bin-path=. hledger hledger-web network-2.7.0.2 | #- stack build --test --copy-bins --local-bin-path=. hledger hledger-web network-2.7.0.2 | ||||||
|  | # use ghc 8.2 to avoid hledger-web -> network/stack/ghc/windows build issue | ||||||
|  | # don't run test suites to avoid easytest/windows utf8 issue | ||||||
|  | - stack build --copy-bins --local-bin-path=. hledger hledger-web --stack-yaml=stack-ghc8.2.yaml  | ||||||
| - 7z a -tzip hledger.zip hledger.exe hledger-web.exe | - 7z a -tzip hledger.zip hledger.exe hledger-web.exe | ||||||
| 
 | 
 | ||||||
| #- hledger-install/hledger-install.sh | #- hledger-install/hledger-install.sh | ||||||
|  | |||||||
| @ -244,6 +244,10 @@ FLAGS | |||||||
| testcmd :: CliOpts -> Journal -> IO () | testcmd :: CliOpts -> Journal -> IO () | ||||||
| testcmd opts _undefined = do  | testcmd opts _undefined = do  | ||||||
|   let args = words' $ query_ $ reportopts_ opts |   let args = words' $ query_ $ reportopts_ opts | ||||||
|  |   -- workaround for https://github.com/joelburget/easytest/issues/11  | ||||||
|  | --  import System.IO (hSetEncoding, stdout, stderr, utf8) | ||||||
|  | --  hSetEncoding stdout utf8 | ||||||
|  | --  hSetEncoding stderr utf8 | ||||||
|   e <- runEasytests args $ EasyTest.tests [tests_Hledger, tests_Commands] |   e <- runEasytests args $ EasyTest.tests [tests_Hledger, tests_Commands] | ||||||
|   if e then exitFailure else exitSuccess |   if e then exitFailure else exitSuccess | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user