Skip to content

stack-yaml-8.6.5: remove drop-packages #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 10, 2022
Merged

stack-yaml-8.6.5: remove drop-packages #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1a099c
stack-yaml-8.6.5: remove drop-packages
andreasabel Jun 2, 2022
f40567d
Haskell-CI: bump to 9.2.3, try 9.4.1
andreasabel Jun 2, 2022
4ee7b8f
Clean up stack-8.6.5.yaml
andreasabel Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.15.20220504
# version: 0.15.20220525
#
# REGENDATA ("0.15.20220504",["github","hackage-cli.cabal"])
# REGENDATA ("0.15.20220525",["github","hackage-cli.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -32,9 +32,14 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.2.2
- compiler: ghc-9.4.0.20220501
compilerKind: ghc
compilerVersion: 9.2.2
compilerVersion: 9.4.0.20220501
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.2.3
compilerKind: ghc
compilerVersion: 9.2.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.2
Expand Down Expand Up @@ -75,8 +80,9 @@ jobs:
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
if [ "${{ matrix.setup-method }}" = ghcup ]; then
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
if $HEADHACKAGE; then "$HOME/.ghcup/bin/ghcup" config add-release-channel https://github.com/raw/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; fi
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
apt-get update
Expand All @@ -86,7 +92,7 @@ jobs:
apt-get update
apt-get install -y "$HCNAME" libbrotli-dev
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
fi
Expand Down Expand Up @@ -119,7 +125,7 @@ jobs:
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
env:
Expand Down Expand Up @@ -148,6 +154,17 @@ jobs:
repository hackage.haskell.org
url: http://hackage.haskell.org/
EOF
if $HEADHACKAGE; then
cat >> $CABAL_CONFIG <<EOF
repository head.hackage.ghc.haskell.org
url: https://ghc.gitlab.haskell.org/head.hackage/
secure: True
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
key-threshold: 3
EOF
fi
cat >> $CABAL_CONFIG <<EOF
program-default-options
ghc-options: $GHCJOBS +RTS -M3G -RTS
Expand Down Expand Up @@ -199,6 +216,9 @@ jobs:
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
EOF
if $HEADHACKAGE; then
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
fi
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|binary|hackage-cli)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
ghc-ver: 8.10.7
- os: windows-latest
ghc-ver: 8.10.7
- os: windows-latest
ghc-ver: 8.6.5
env:
ARGS: "--stack-yaml stack-${{ matrix.ghc-ver }}.yaml --no-terminal --system-ghc"

Expand Down
5 changes: 3 additions & 2 deletions hackage-cli.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ build-type: Simple

tested-with:
-- Keep in descending order.
GHC == 9.2.2
GHC == 9.4.1
GHC == 9.2.3
GHC == 9.0.2
GHC == 8.10.7
GHC == 8.8.4
Expand All @@ -42,7 +43,7 @@ library cabal-revisions
ghc-options: -Wall -Wcompat

build-depends:
, base >= 4.10.0.0 && < 4.17
, base >= 4.10.0.0 && < 4.18
, bytestring >= 0.10.4.0 && < 0.12
, Cabal >= 3.4 && < 3.7
, containers >= 0.5.0.0 && < 0.7
Expand Down
12 changes: 4 additions & 8 deletions stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,15 @@ compiler-check: match-exact
packages:
- .

# Force use of newer HsOpenSSL, used by http-iostreams
drop-packages:
- HsOpenSSL

extra-deps:
- Cabal-3.4.1.0
# HSOpenSSL-0.11.6.1: Windows: Use libcrypto instead of eay; allow pkg-config.
- HsOpenSSL-0.11.6.1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, why does in Windows CI HsOpenSSL-0.11.7.2 get picked? https://github.com/hackage-trustees/hackage-cli/runs/6712301152?check_suite_focus=true#step:9:993

# Needed because of drop-packages:
# Needed for HsOpenSSL-0.11.6.1:
- base64-bytestring-1.1.0.0
- ghc-byteorder-4.11.0.0.10
- xor-0.0.1.0
# Missing from lts-14.27:
- Cabal-3.4.1.0
- brotli-0.0.0.0
- brotli-streams-0.0.0.0
- ghc-byteorder-4.11.0.0.10
- http-io-streams-0.1.6.0@rev:0
- xor-0.0.1.0