Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
harendra-kumar committed Dec 14, 2023
1 parent 616b52b commit 6a24926
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
13 changes: 6 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ preinstall: &preinstall
# required to (re)generate the configure script
apt-get install -y autoconf
apt-get install -y libtinfo-dev
# required for packcheck
apt-get install -y curl
# required for outbound https for stack and for stack setup
apt-get install -y netbase xz-utils make
Expand All @@ -94,6 +90,7 @@ preinstall: &preinstall
unset STACK_YAML
# Get packcheck if needed
apt-get install -y curl
CURL=$(which curl)
PACKCHECK_URL=${PACKCHECK_GITHUB_URL}/${PACKCHECK_GITHUB_COMMIT}/packcheck.sh
if test ! -e "$PACKCHECK"; then $CURL -sL -o "$PACKCHECK" $PACKCHECK_URL; fi;
Expand All @@ -111,6 +108,8 @@ preinstall: &preinstall
GHCUP_VER=0.1.19.5
$CURL -sL -o ./ghcup https://downloads.haskell.org/~ghcup/$GHCUP_VER/${GHCUP_ARCH}-ghcup-$GHCUP_VER
chmod +x ./ghcup
apt-get install -y gcc
apt-get install -y libtinfo-dev
./ghcup install ghc $GHCVER
./ghcup set ghc $GHCVER
./ghcup install cabal $CABALVER
Expand Down Expand Up @@ -190,18 +189,18 @@ jobs:
# apt-get install -y libsdl2-dev
# bash -c "$PACKCHECK $BUILD"
# - *save
# stack-ghc-9_4_8:
# stack-ghc-9_6_3:
# <<: *env
# executor: amd64-executor
# steps:
# - checkout
# - *preinstall
# - *restore
# - run:
# name: stack lts-21.24
# name: stack nightly-2023-12-14
# environment:
# BUILD: "stack"
# RESOLVER: "lts-21.24"
# RESOLVER: "nightly-2023-12-14"
# STACK_YAML: "stack.yaml"
# SDIST_OPTIONS: "--ignore-check"
# command: |
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ environment:
# version.
#STACKVER: "1.6.5"
STACK_UPGRADE: "y"
RESOLVER: "lts-20.14"
RESOLVER: "nightly-2023-12-14"
STACK_ROOT: "c:\\sr"
STACK_YAML: "stack.yaml"

Expand Down Expand Up @@ -65,7 +65,7 @@ environment:
# If you have not committed packcheck.sh in your repo at PACKCHECK_LOCAL_PATH
# then it is automatically pulled from this URL.
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/harendra-kumar/packcheck"
PACKCHECK_GITHUB_COMMIT: "563702bd02c41343dcd3dfcfef0845ca428a9240"
PACKCHECK_GITHUB_COMMIT: "a68b7b9c7c21eef8ed273e67030efb1d4fec027c"

# Override the temp directory to avoid sed escaping issues
# See https://github.com/haskell/cabal/issues/5386
Expand Down

0 comments on commit 6a24926

Please sign in to comment.