Skip to content

Commit e340c7f

Browse files
christiaanbchristiaanb
authored
Merge pull request #1 from clash-lang/prepare_hackage_release
Prepare hackage release
2 parents 6cb2bb3 + a22adb3 commit e340c7f

13 files changed

+1554
-1042
lines changed

‎.github/workflows/haskell-ci.yml

+247
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,247 @@
1+
# This GitHub workflow config has been generated by a script via
2+
#
3+
# haskell-ci 'github' 'sop-satisfier.cabal'
4+
#
5+
# To regenerate the script (for example after adjusting tested-with) run
6+
#
7+
# haskell-ci regenerate
8+
#
9+
# For more information, see https://github.com/haskell-CI/haskell-ci
10+
#
11+
# version: 0.19.20241223
12+
#
13+
# REGENDATA ("0.19.20241223",["github","sop-satisfier.cabal"])
14+
#
15+
name: Haskell-CI
16+
on:
17+
- push
18+
- pull_request
19+
jobs:
20+
linux:
21+
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22+
runs-on: ubuntu-20.04
23+
timeout-minutes:
24+
60
25+
container:
26+
image: buildpack-deps:jammy
27+
continue-on-error: ${{ matrix.allow-failure }}
28+
strategy:
29+
matrix:
30+
include:
31+
- compiler: ghc-9.12.1
32+
compilerKind: ghc
33+
compilerVersion: 9.12.1
34+
setup-method: ghcup
35+
allow-failure: false
36+
- compiler: ghc-9.10.1
37+
compilerKind: ghc
38+
compilerVersion: 9.10.1
39+
setup-method: ghcup
40+
allow-failure: false
41+
- compiler: ghc-9.8.4
42+
compilerKind: ghc
43+
compilerVersion: 9.8.4
44+
setup-method: ghcup
45+
allow-failure: false
46+
- compiler: ghc-9.6.6
47+
compilerKind: ghc
48+
compilerVersion: 9.6.6
49+
setup-method: ghcup
50+
allow-failure: false
51+
- compiler: ghc-9.4.8
52+
compilerKind: ghc
53+
compilerVersion: 9.4.8
54+
setup-method: ghcup
55+
allow-failure: false
56+
- compiler: ghc-9.2.8
57+
compilerKind: ghc
58+
compilerVersion: 9.2.8
59+
setup-method: ghcup
60+
allow-failure: false
61+
- compiler: ghc-9.0.2
62+
compilerKind: ghc
63+
compilerVersion: 9.0.2
64+
setup-method: ghcup
65+
allow-failure: false
66+
- compiler: ghc-8.10.7
67+
compilerKind: ghc
68+
compilerVersion: 8.10.7
69+
setup-method: ghcup
70+
allow-failure: false
71+
- compiler: ghc-8.8.4
72+
compilerKind: ghc
73+
compilerVersion: 8.8.4
74+
setup-method: ghcup
75+
allow-failure: false
76+
fail-fast: false
77+
steps:
78+
- name: apt-get install
79+
run: |
80+
apt-get update
81+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
82+
- name: Install GHCup
83+
run: |
84+
mkdir -p "$HOME/.ghcup/bin"
85+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
86+
chmod a+x "$HOME/.ghcup/bin/ghcup"
87+
- name: Install cabal-install
88+
run: |
89+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
90+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
91+
- name: Install GHC (GHCup)
92+
if: matrix.setup-method == 'ghcup'
93+
run: |
94+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
95+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
96+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
97+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
98+
echo "HC=$HC" >> "$GITHUB_ENV"
99+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
100+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
101+
env:
102+
HCKIND: ${{ matrix.compilerKind }}
103+
HCNAME: ${{ matrix.compiler }}
104+
HCVER: ${{ matrix.compilerVersion }}
105+
- name: Set PATH and environment variables
106+
run: |
107+
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
108+
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
109+
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
110+
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
111+
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
112+
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
113+
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
114+
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
115+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
116+
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
117+
env:
118+
HCKIND: ${{ matrix.compilerKind }}
119+
HCNAME: ${{ matrix.compiler }}
120+
HCVER: ${{ matrix.compilerVersion }}
121+
- name: env
122+
run: |
123+
env
124+
- name: write cabal config
125+
run: |
126+
mkdir -p $CABAL_DIR
127+
cat >> $CABAL_CONFIG <<EOF
128+
remote-build-reporting: anonymous
129+
write-ghc-environment-files: never
130+
remote-repo-cache: $CABAL_DIR/packages
131+
logs-dir: $CABAL_DIR/logs
132+
world-file: $CABAL_DIR/world
133+
extra-prog-path: $CABAL_DIR/bin
134+
symlink-bindir: $CABAL_DIR/bin
135+
installdir: $CABAL_DIR/bin
136+
build-summary: $CABAL_DIR/logs/build.log
137+
store-dir: $CABAL_DIR/store
138+
install-dirs user
139+
prefix: $CABAL_DIR
140+
repository hackage.haskell.org
141+
url: http://hackage.haskell.org/
142+
EOF
143+
cat >> $CABAL_CONFIG <<EOF
144+
program-default-options
145+
ghc-options: $GHCJOBS +RTS -M3G -RTS
146+
EOF
147+
cat $CABAL_CONFIG
148+
- name: versions
149+
run: |
150+
$HC --version || true
151+
$HC --print-project-git-commit-id || true
152+
$CABAL --version || true
153+
- name: update cabal index
154+
run: |
155+
$CABAL v2-update -v
156+
- name: install cabal-plan
157+
run: |
158+
mkdir -p $HOME/.cabal/bin
159+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
160+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
161+
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
162+
rm -f cabal-plan.xz
163+
chmod a+x $HOME/.cabal/bin/cabal-plan
164+
cabal-plan --version
165+
- name: checkout
166+
uses: actions/checkout@v4
167+
with:
168+
path: source
169+
- name: initial cabal.project for sdist
170+
run: |
171+
touch cabal.project
172+
echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
173+
cat cabal.project
174+
- name: sdist
175+
run: |
176+
mkdir -p sdist
177+
$CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
178+
- name: unpack
179+
run: |
180+
mkdir -p unpacked
181+
find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
182+
- name: generate cabal.project
183+
run: |
184+
PKGDIR_sop_satisfier="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/sop-satisfier-[0-9.]*')"
185+
echo "PKGDIR_sop_satisfier=${PKGDIR_sop_satisfier}" >> "$GITHUB_ENV"
186+
rm -f cabal.project cabal.project.local
187+
touch cabal.project
188+
touch cabal.project.local
189+
echo "packages: ${PKGDIR_sop_satisfier}" >> cabal.project
190+
echo "package sop-satisfier" >> cabal.project
191+
echo " ghc-options: -Werror=missing-methods" >> cabal.project
192+
cat >> cabal.project <<EOF
193+
EOF
194+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(sop-satisfier)$/; }' >> cabal.project.local
195+
cat cabal.project
196+
cat cabal.project.local
197+
- name: dump install plan
198+
run: |
199+
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
200+
cabal-plan
201+
- name: restore cache
202+
uses: actions/cache/restore@v4
203+
with:
204+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
205+
path: ~/.cabal/store
206+
restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
207+
- name: install dependencies
208+
run: |
209+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
210+
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all
211+
- name: build w/o tests
212+
run: |
213+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
214+
- name: build
215+
run: |
216+
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
217+
- name: tests
218+
run: |
219+
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
220+
- name: cabal check
221+
run: |
222+
cd ${PKGDIR_sop_satisfier} || false
223+
${CABAL} -vnormal check
224+
- name: haddock
225+
run: |
226+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
227+
- name: unconstrained build
228+
run: |
229+
rm -f cabal.project.local
230+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
231+
- name: save cache
232+
if: always()
233+
uses: actions/cache/save@v4
234+
with:
235+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
236+
path: ~/.cabal/store
237+
fourmolu:
238+
runs-on: ubuntu-latest
239+
steps:
240+
# Note that you must checkout your code before running haskell-actions/run-fourmolu
241+
- uses: actions/checkout@v4
242+
- uses: haskell-actions/run-fourmolu@v10
243+
with:
244+
version: "0.16.2.0"
245+
pattern: |
246+
src/**/*.hs
247+
tests/**/*.hs

‎.vscode/settings.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"files.exclude": {
3+
"**/*.dyn_hi": true,
4+
"**/*.dyn_o": true,
5+
"**/*.hi": true,
6+
"**/*.o": true,
7+
"dist-newstyle": true,
8+
".stack-work": true,
9+
".ghc.environment.*": true
10+
},
11+
"files.trimTrailingWhitespace": true,
12+
"files.insertFinalNewline": true,
13+
"editor.tabSize": 2,
14+
"[haskell]": {
15+
"editor.formatOnSave": false
16+
}
17+
}

‎format.sh

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
# Help message
5+
show_help() {
6+
local script_name
7+
script_name=$(basename "$0")
8+
echo "Fourmolu formatting Script.
9+
10+
Usage:
11+
$script_name diff Format the current git diff.
12+
$script_name full Format all source files.
13+
$script_name check Check the formatting of the source files.
14+
$script_name (-h | --help)
15+
16+
Options:
17+
-h --help Show this screen."
18+
}
19+
20+
# Main script logic
21+
if [[ "$#" -eq 0 || "$1" == "-h" || "$1" == "--help" ]]; then
22+
show_help
23+
exit 0
24+
fi
25+
26+
exclude_files=(
27+
28+
)
29+
30+
# Make sure it doesn't matter from where this script is executed
31+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
32+
cd $DIR
33+
34+
if [ $1 == "diff" ] ; then
35+
src_files=$(git diff --cached --name-only --diff-filter=ACMR -- '*.hs')
36+
else
37+
src_files=$(find src tests -type f -name "*.hs")
38+
fi
39+
40+
src_files_str=$(printf "%s\n" "${src_files[@]}" | sed 's| |\\ |g')
41+
exclude_files_str=$(printf "%s\n" "${exclude_files[@]}" | sed 's| |\\ |g')
42+
src_files=$(echo "$src_files_str" | grep -vwE "$exclude_files_str")
43+
44+
if [ -z "$src_files" ]; then
45+
exit 0;
46+
fi
47+
48+
if [[ "$1" == "diff" || "$1" == "full" ]] ; then
49+
fourmolu --mode inplace $src_files
50+
elif [[ "$1" == "check" ]] ; then
51+
fourmolu --mode check $src_files
52+
else
53+
echo "Expected a single argument, \"full\", \"diff\", \"check\" or \"--help\"" >&2
54+
exit 3
55+
fi

‎fourmolu.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
indentation: 2
2+
column-limit: 90

‎sop-satisfier.cabal

+11-8
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,21 @@ description:
88
It can reason about expressions contatining
99
addition and multiplication.
1010
It also provides limited support of exponentiations and subtraction.
11-
license: GPL-3.0-or-later
11+
license: BSD-3-Clause
1212
license-file: LICENSE
13-
author: Aleksandr Pokatilov
14-
maintainer: pokatilov0802@gmail.com
13+
author: Aleksandr Pokatilov <[email protected]>
14+
maintainer: QBayLogic B.V. <devops@qbaylogic.com>
1515
build-type: Simple
1616
category: Solver, Symbolic Arithmetic
1717
extra-doc-files: CHANGELOG.md
1818
README.md
19+
tested-with: GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.8,
20+
GHC == 9.4.8, GHC == 9.6.6, GHC == 9.8.4, GHC == 9.10.1,
21+
GHC == 9.12.1
1922

2023
source-repository head
2124
type: git
22-
location: https://github.com/NeuroCorgi/sop-satisfier
25+
location: https://github.com/clash-lang/sop-satisfier
2326

2427
common warnings
2528
ghc-options: -Wall
@@ -33,16 +36,16 @@ library
3336
SoPSat.Internal.SoP,
3437
SoPSat.Internal.NewtonsMethod,
3538
SoPSat.Internal.SolverMonad
36-
build-depends: base >=4.16 && <5,
37-
containers ^>=0.6.7,
38-
transformers >=0.5
39+
build-depends: base >=4.13 && <5,
40+
containers >=0.6.2.1 && <0.8,
41+
transformers >=0.5 && <0.7
3942
hs-source-dirs: src
4043
default-language: Haskell2010
4144

4245
test-suite system-tests
4346
type: exitcode-stdio-1.0
4447
main-is: SystemTests.hs
45-
build-depends: base >=4.16 && <5,
48+
build-depends: base >=4.13 && <5,
4649
sop-satisfier,
4750
tasty ^>= 1.5,
4851
tasty-hunit ^>=0.9

0 commit comments

Comments
 (0)