Skip to content

Commit

Permalink
revert repo_dir strip to try recover stack windows
Browse files Browse the repository at this point in the history
  • Loading branch information
shayne-fletcher committed Jan 29, 2024
1 parent f87ea74 commit f3b4683
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/hlint-from-scratch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
- run: ./hlint-from-scratch.sh --ghc-flavor="" --stack-yaml=stack-exact.yaml --resolver=ghc-9.6.4 --no-checkout
shell: bash
if: matrix.os =='ubuntu' || matrix.os == 'macos'
- run: ./hlint-from-scratch.sh --ghc-flavor="" --stack-yaml=stack-exact.yaml --resolver=ghc-9.6.4 --no-checkout --no-builds
shell: bash
if: matrix.os == 'windows'
# - run: ./hlint-from-scratch.sh --ghc-flavor="" --stack-yaml=stack-exact.yaml --resolver=ghc-9.6.4 --no-checkout --no-cabal
# shell: bash
# if: matrix.os == 'windows'
2 changes: 2 additions & 0 deletions hlint-from-scratch-cabal-build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ echo "cabal-install version: $(cabal -V)"
echo "ghc: $(which ghc)"
echo "ghc version : $(ghc -V)"

echo "cabal build starting up: getting packages"

build_dir_for_this_ghc="$build_dir/$ghc_version"
mkdir -p "$build_dir_for_this_ghc"
cd "$build_dir_for_this_ghc"
Expand Down
8 changes: 4 additions & 4 deletions hlint-from-scratch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ fi

# ghc-lib-parser-ex

cd "$repo_dir"/ghc-lib-parser-ex && git checkout .
cd ../ghc-lib-parser-ex && git checkout .
branch=$(git rev-parse --abbrev-ref HEAD)

# if the flavor indicates ghc's master branch get on
Expand Down Expand Up @@ -347,7 +347,7 @@ set -e

# Hlint

cd "$repo_dir"/hlint && git checkout .
cd ../hlint && git checkout .
branch=$(git rev-parse --abbrev-ref HEAD)
# if the flavor indicates ghc's master branch get on hlint's
# 'ghc-next' branch ...
Expand Down Expand Up @@ -384,8 +384,8 @@ resolver: $resolver
packages:
- .
extra-deps:
- archive: $repo_dir_stripped/ghc-lib/ghc-lib-parser-$version.tar.gz
- archive: $repo_dir_stripped/ghc-lib-parser-ex/ghc-lib-parser-ex-$version.tar.gz
- archive: ${repo_dir_stripped}/ghc-lib/ghc-lib-parser-$version.tar.gz
- archive: ${repo_dir_stripped}/ghc-lib-parser-ex/ghc-lib-parser-ex-$version.tar.gz
ghc-options:
"$DOLLAR$everything": -j
"$DOLLAR$locals": -ddump-to-file -ddump-hi -Werror=unused-imports -Werror=unused-local-binds -Werror=unused-top-binds -Werror=orphans
Expand Down

0 comments on commit f3b4683

Please sign in to comment.