Skip to content

Commit

Permalink
Split internals into their own package
Browse files Browse the repository at this point in the history
Fixes #192
  • Loading branch information
hasufell committed Jul 25, 2023
1 parent 367f6bf commit 1293649
Show file tree
Hide file tree
Showing 61 changed files with 1,075 additions and 109 deletions.
31 changes: 19 additions & 12 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,19 @@ jobs:
set -eux
[ "$(ghc --numeric-version)" = "${{ matrix.ghc }}" ]
cabal update
cabal build --enable-tests --enable-benchmarks
cabal test
cabal bench
cabal haddock
cabal build --enable-tests --enable-benchmarks all
cabal test filepath
cabal bench filepath
cabal haddock filepath
(
cd filepath
cabal check
cabal sdist
)
(
cd filepath-internals
cabal check
)
cabal sdist all
shell: bash

- if: matrix.os == 'ubuntu-latest'
Expand All @@ -64,7 +71,7 @@ jobs:
set -eux
export "PATH=$HOME/.cabal/bin:$PATH"
cabal install --overwrite-policy=always --install-method=copy cpphs
make all
make -C filepath all
git diff --exit-code
i386:
Expand All @@ -82,8 +89,8 @@ jobs:
run: |
. ~/.ghcup/env
cabal update
cabal test
cabal bench
cabal test filepath
cabal bench filepath
# We use github.com/haskell self-hosted runners for ARM testing.
# If they become unavailable in future, put ['armv7', 'aarch64']
Expand All @@ -107,13 +114,13 @@ jobs:
uses: docker://hasufell/arm32v7-ubuntu-haskell:focal
name: Run build (arm32v7 linux)
with:
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"
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"

- if: matrix.arch == 'arm64v8'
uses: docker://hasufell/arm64v8-ubuntu-haskell:focal
name: Run build (arm64v8 linux)
with:
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"
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"

darwin_arm:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -144,7 +151,7 @@ jobs:
export RANLIB="$HOME/.brew/opt/llvm@11/bin/llvm-ranlib"
. .github/scripts/env.sh
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
cabal test
cabal bench
cabal test filepath
cabal bench filepath
env:
HOMEBREW_CHANGE_ARCH_TO_ARM: 1
47 changes: 0 additions & 47 deletions README.md

This file was deleted.

1 change: 1 addition & 0 deletions README.md
3 changes: 2 additions & 1 deletion cabal.project
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
packages: ./
packages: ./filepath/filepath.cabal
./filepath-internals/filepath-internals.cabal
File renamed without changes.
3 changes: 3 additions & 0 deletions filepath-internals/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# filepath-internals

FilePath internals. Use at your own risk.
File renamed without changes.
Loading

0 comments on commit 1293649

Please sign in to comment.