Merge pull request #218 from commercialhaskell/217-make-absolute

Switch to makeAbsolute (fixes #217)
commercialhaskell · Apr 28, 2020 · 6539e15 · 6539e15
2 parents e878b3d + a2c4811
commit 6539e15
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml
@@ -14,17 +14,17 @@ jobs:
 - template: azure-linux-template.yml
   parameters:
     name: Linux
-    vmImage: ubuntu-16.04
+    vmImage: ubuntu-latest
     os: linux
 
 - template: azure-osx-template.yml
   parameters:
     name: macOS
-    vmImage: macOS-10.13
+    vmImage: macOS-latest
     os: osx
 
 - template: azure-windows-template.yml
   parameters:
    name: Windows
-   vmImage: vs2017-win2016
+   vmImage: windows-latest
    os: windows
diff --git a/rio/ChangeLog.md b/rio/ChangeLog.md
@@ -1,5 +1,9 @@
 # Changelog for rio
 
+## 0.1.15.1
+
+* Replace `canonicalizePath` with `makeAbsolute` [#217](https://github.com/commercialhaskell/rio/issues/217)
+
 ## 0.1.15.0
 
 * Include source in log messages

diff --git a/rio/package.yaml b/rio/package.yaml
@@ -1,5 +1,5 @@
 name: rio
-version: 0.1.15.0
+version: 0.1.15.1
 synopsis: A standard library for Haskell
 description: See README and Haddocks at <https://www.stackage.org/package/rio>
 license: MIT

diff --git a/rio/rio.cabal b/rio/rio.cabal
@@ -4,10 +4,10 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 88c70b06dfc2b555bc230e489348124cfcbdc0bdbf0ef59810cae48053937a10
+-- hash: 30ccd150c619c6c6fa96ebc7d3b33d6cb4ea1b2e45228e4cba5c35c1bc64cd63
 
 name:           rio
-version:        0.1.15.0
+version:        0.1.15.1
 synopsis:       A standard library for Haskell
 description:    See README and Haddocks at <https://www.stackage.org/package/rio>
 category:       Control

diff --git a/rio/src/RIO/Process.hs b/rio/src/RIO/Process.hs
@@ -588,7 +588,7 @@ findExecutable
   -- ^ Full path to that executable on success
 findExecutable name | any FP.isPathSeparator name = do
   names <- addPcExeExtensions name
-  testFPs (pure $ Left $ ExecutableNotFoundAt name) D.canonicalizePath names
+  testFPs (pure $ Left $ ExecutableNotFoundAt name) D.makeAbsolute names
 findExecutable name = do
   pc <- view processContextL
   m <- readIORef $ pcExeCache pc