Skip to content

Commit 8a3ea50

Browse files
Update appveyor ci config, sync with packcheck
1 parent 6cc2134 commit 8a3ea50

2 files changed

Lines changed: 32 additions & 43 deletions

File tree

appveyor.yml

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
# packcheck-0.4.2
1+
# packcheck-0.7.1
22
# You can use any of the options supported by packcheck as environment
33
# variables here. See https://github.com/composewell/packcheck for all
44
# options and their explanation.
55

6+
#branches:
7+
# only:
8+
# - master
9+
610
environment:
711
# ------------------------------------------------------------------------
812
# Global options, you can use these per build as well
@@ -11,42 +15,34 @@ environment:
1115
# ------------------------------------------------------------------------
1216
# Common options
1317
# ------------------------------------------------------------------------
14-
# GHC_OPTIONS: "-Werror"
1518
CABAL_REINIT_CONFIG: "y"
1619
LC_ALL: "C.UTF-8"
1720

21+
# ------------------------------------------------------------------------
22+
# How to build
23+
# ------------------------------------------------------------------------
24+
#
25+
GHCUP_VERSION: "0.1.50.2"
26+
GHCVER: "9.10.3"
27+
#CABALVER: "3.10.3.0"
28+
1829
# ------------------------------------------------------------------------
1930
# What to build
2031
# ------------------------------------------------------------------------
2132
# DISABLE_TEST: "y"
2233
# DISABLE_BENCH: "y"
2334
# DISABLE_DOCS: "y"
24-
DISABLE_SDIST_BUILD: "y"
2535
# DISABLE_DIST_CHECKS: "y"
26-
27-
# ------------------------------------------------------------------------
28-
# stack options
29-
# ------------------------------------------------------------------------
30-
# Note requiring a specific version of stack using STACKVER may fail due to
31-
# github API limit while checking and upgrading/downgrading to the specific
32-
# version.
33-
#STACKVER: "1.6.5"
34-
STACK_UPGRADE: "y"
35-
RESOLVER: "lts-21.25"
36-
STACK_ROOT: "c:\\sr"
36+
# DISABLE_SDIST_BUILD: "y"
37+
# Note: these require the "diff" utility.
38+
# DISABLE_SDIST_GIT_CHECK: "y"
39+
DISABLE_SDIST_PROJECT_CHECK: "y"
3740

3841
# ------------------------------------------------------------------------
3942
# cabal options
4043
# ------------------------------------------------------------------------
4144
CABAL_CHECK_RELAX: "y"
42-
CABAL_NO_SANDBOX: "y"
43-
CABAL_HACKAGE_MIRROR: "hackage.haskell.org:http://hackage.fpcomplete.com"
44-
45-
# ------------------------------------------------------------------------
46-
# Where to find the required tools
47-
# ------------------------------------------------------------------------
48-
PATH: "%PATH%;%APPDATA%\\local\\bin"
49-
LOCAL_BIN: "%APPDATA%\\local\\bin"
45+
#CABAL_PROJECT: "cabal.project"
5046

5147
# ------------------------------------------------------------------------
5248
# Location of packcheck.sh (the shell script invoked to perform CI tests ).
@@ -59,31 +55,33 @@ environment:
5955
# If you have not committed packcheck.sh in your repo at PACKCHECK_LOCAL_PATH
6056
# then it is automatically pulled from this URL.
6157
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
62-
PACKCHECK_GITHUB_COMMIT: "79fb4437009a7ebdada33d0493c27ee30160ec3f"
58+
PACKCHECK_GITHUB_COMMIT: "7c52b65e2eced274d819d717987a564d9def40dd"
6359

6460
# Override the temp directory to avoid sed escaping issues
6561
# See https://github.com/haskell/cabal/issues/5386
6662
TMP: "c:\\tmp"
6763

64+
# Bump the -> version to clear the cache
65+
# packcheck uses "%APPDATA%\\local" to install tools like hlint etc.
66+
# cabal may use "%APPDATA%\\cabal" or "c:\\cabal"
67+
# ghcup may use "%APPDATA%\\ghcup" or "c:\\ghcup"
6868
cache:
69-
- "%STACK_ROOT%"
70-
- "%LOCAL_BIN%"
69+
- "%APPDATA%\\local\\bin -> v1"
7170
- "%APPDATA%\\cabal"
72-
- "%APPDATA%\\ghc"
73-
# - "%LOCALAPPDATA%\\Programs\\stack"
71+
- "%LOCALAPPDATA%\\cabal"
72+
- "C:\\ghcup"
73+
- "C:\\cabal"
7474

75+
# Folder where the repository is cloned.
7576
clone_folder: "c:\\pkg"
7677
build: off
7778

7879
before_test:
79-
- if not exist %PACKCHECK_LOCAL_PATH% curl -sSkL -o%PACKCHECK_LOCAL_PATH% %PACKCHECK_GITHUB_URL%/%PACKCHECK_GITHUB_COMMIT%/packcheck.sh
80-
- if not exist %LOCAL_BIN% mkdir %LOCAL_BIN%
81-
- where stack.exe || curl -sSkL -ostack.zip http://www.stackage.org/stack/windows-x86_64 && 7z x stack.zip stack.exe && move stack.exe %LOCAL_BIN%
82-
- if defined STACKVER (stack upgrade --binary-only --binary-version %STACKVER%) else (stack upgrade --binary-only || ver > nul)
83-
- stack --version
80+
- if not exist %PACKCHECK_LOCAL_PATH% curl --fail -sSL -o%PACKCHECK_LOCAL_PATH% %PACKCHECK_GITHUB_URL%/%PACKCHECK_GITHUB_COMMIT%/packcheck.sh
8481

8582
test_script:
86-
- stack setup > nul
8783
- for /f "usebackq tokens=*" %%i in (`where 7z.exe`) do set PATH7Z=%%i\..
8884
- for /f "usebackq tokens=*" %%i in (`where git.exe`) do set PATHGIT=%%i\..
89-
- chcp 65001 && stack exec bash -- -c "chmod +x %PACKCHECK_LOCAL_PATH%; %PACKCHECK_LOCAL_PATH% stack PATH=/usr/bin:\"%PATH7Z%\":\"%PATHGIT%\""
85+
- for /f "usebackq tokens=*" %%i in (`where curl.exe`) do set PATHCURL=%%i\..
86+
- chcp 65001
87+
- bash %PACKCHECK_LOCAL_PATH% cabal PATH="/usr/bin:%PATH7Z%:%PATHGIT%:%PATHCURL%"

stack.yaml

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)