Skip to content

Commit 9c9691c

Browse files
committed
Split internals into their own package
Fixes #192
1 parent 367f6bf commit 9c9691c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1076
-110
lines changed

.github/workflows/test.yaml

+19-12
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,19 @@ jobs:
5050
set -eux
5151
[ "$(ghc --numeric-version)" = "${{ matrix.ghc }}" ]
5252
cabal update
53-
cabal build --enable-tests --enable-benchmarks
54-
cabal test
55-
cabal bench
56-
cabal haddock
53+
cabal build --enable-tests --enable-benchmarks all
54+
cabal test filepath
55+
cabal bench filepath
56+
cabal haddock filepath
57+
(
58+
cd filepath
5759
cabal check
58-
cabal sdist
60+
)
61+
(
62+
cd filepath-internals
63+
cabal check
64+
)
65+
cabal sdist all
5966
shell: bash
6067

6168
- if: matrix.os == 'ubuntu-latest'
@@ -64,7 +71,7 @@ jobs:
6471
set -eux
6572
export "PATH=$HOME/.cabal/bin:$PATH"
6673
cabal install --overwrite-policy=always --install-method=copy cpphs
67-
make all
74+
make -C filepath all
6875
git diff --exit-code
6976
7077
i386:
@@ -82,8 +89,8 @@ jobs:
8289
run: |
8390
. ~/.ghcup/env
8491
cabal update
85-
cabal test
86-
cabal bench
92+
cabal test filepath
93+
cabal bench filepath
8794
8895
# We use github.com/haskell self-hosted runners for ARM testing.
8996
# If they become unavailable in future, put ['armv7', 'aarch64']
@@ -107,13 +114,13 @@ jobs:
107114
uses: docker://hasufell/arm32v7-ubuntu-haskell:focal
108115
name: Run build (arm32v7 linux)
109116
with:
110-
args: sh -c "cabal update && ghcup install ghc --isolate=/usr --force 9.2.2 && cabal test -w ghc-9.2.2 && cabal bench -w ghc-9.2.2"
117+
args: sh -c "cabal update && ghcup install ghc --isolate=/usr --force 9.2.2 && cabal test -w ghc-9.2.2 filepath && cabal bench -w ghc-9.2.2 filepath"
111118

112119
- if: matrix.arch == 'arm64v8'
113120
uses: docker://hasufell/arm64v8-ubuntu-haskell:focal
114121
name: Run build (arm64v8 linux)
115122
with:
116-
args: sh -c "cabal update && ghcup install ghc --isolate=/usr --force 9.2.2 && cabal test -w ghc-9.2.2 && cabal bench -w ghc-9.2.2"
123+
args: sh -c "cabal update && ghcup install ghc --isolate=/usr --force 9.2.2 && cabal test -w ghc-9.2.2 filepath && cabal bench -w ghc-9.2.2 filepath"
117124

118125
darwin_arm:
119126
runs-on: ${{ matrix.os }}
@@ -144,7 +151,7 @@ jobs:
144151
export RANLIB="$HOME/.brew/opt/llvm@11/bin/llvm-ranlib"
145152
. .github/scripts/env.sh
146153
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_GHC_VERSION=${{ matrix.ghc }} BOOTSTRAP_HASKELL_ADJUST_BASHRC=yes sh
147-
cabal test
148-
cabal bench
154+
cabal test filepath
155+
cabal bench filepath
149156
env:
150157
HOMEBREW_CHANGE_ARCH_TO_ARM: 1

README.md

-47
This file was deleted.

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
filepath/README.md

cabal.project

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
packages: ./
1+
packages: ./filepath/filepath.cabal
2+
./filepath-internals/filepath-internals.cabal
File renamed without changes.

filepath-internals/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# filepath-internals
2+
3+
FilePath internals. Use at your own risk.
File renamed without changes.

0 commit comments

Comments
 (0)