Skip to content

Commit b4fe2d7

Browse files
authored
Merge pull request #82 from Shimuuar/clean-old-files
Clean old files & links. Update CI
2 parents eeab264 + 15fd235 commit b4fe2d7

File tree

7 files changed

+41
-83
lines changed

7 files changed

+41
-83
lines changed

.appveyor.yml

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

.github/workflows/ci.yml

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,40 @@ jobs:
1818
matrix:
1919
include:
2020
# -- Linux --
21-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.0.2" }
22-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.2.2" }
23-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.4.4" }
24-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.6.5" }
25-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.8.4" }
26-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.10.7" }
27-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.0.2" }
28-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.2.8" }
29-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.4.8" }
30-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.4.8", flags: "-system-erf" }
31-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.4.8", flags: "-system-expm1"}
32-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.6.4" }
33-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.8.2" }
21+
- { cabal: "3.14", os: ubuntu-latest, ghc: "8.0.2" }
22+
- { cabal: "3.14", os: ubuntu-latest, ghc: "8.2.2" }
23+
- { cabal: "3.14", os: ubuntu-latest, ghc: "8.4.4" }
24+
- { cabal: "3.14", os: ubuntu-latest, ghc: "8.6.5" }
25+
- { cabal: "3.14", os: ubuntu-latest, ghc: "8.8.4" }
26+
- { cabal: "3.14", os: ubuntu-latest, ghc: "8.10.7" }
27+
- { cabal: "3.14", os: ubuntu-latest, ghc: "9.0.2" }
28+
- { cabal: "3.14", os: ubuntu-latest, ghc: "9.2.8" }
29+
- { cabal: "3.14", os: ubuntu-latest, ghc: "9.4.8" }
30+
- { cabal: "3.14", os: ubuntu-latest, ghc: "9.4.8", flags: "-system-erf" }
31+
- { cabal: "3.14", os: ubuntu-latest, ghc: "9.4.8", flags: "-system-expm1"}
32+
- { cabal: "3.14", os: ubuntu-latest, ghc: "9.6.7" }
33+
- { cabal: "3.14", os: ubuntu-latest, ghc: "9.8.4" }
34+
- { cabal: "3.14", os: ubuntu-latest, ghc: "9.10.2" }
35+
- { cabal: "3.14", os: ubuntu-latest, ghc: "9.12.2" }
3436
# -- Win --
35-
- { cabal: "3.10", os: windows-latest, ghc: "8.4.4" }
36-
- { cabal: "3.10", os: windows-latest, ghc: "8.6.5" }
37-
- { cabal: "3.10", os: windows-latest, ghc: "8.8.4" }
38-
- { cabal: "3.10", os: windows-latest, ghc: "8.10.7" }
39-
- { cabal: "3.10", os: windows-latest, ghc: "9.0.2" }
40-
- { cabal: "3.10", os: windows-latest, ghc: "9.2.8" }
41-
- { cabal: "3.10", os: windows-latest, ghc: "9.4.8" }
42-
- { cabal: "3.10", os: windows-latest, ghc: "9.6.4" }
43-
- { cabal: "3.10", os: windows-latest, ghc: "9.8.2" }
37+
- { cabal: "3.14", os: windows-latest, ghc: "8.4.4" }
38+
- { cabal: "3.14", os: windows-latest, ghc: "8.6.5" }
39+
- { cabal: "3.14", os: windows-latest, ghc: "8.8.4" }
40+
- { cabal: "3.14", os: windows-latest, ghc: "8.10.7" }
41+
- { cabal: "3.14", os: windows-latest, ghc: "9.0.2" }
42+
- { cabal: "3.14", os: windows-latest, ghc: "9.2.8" }
43+
- { cabal: "3.14", os: windows-latest, ghc: "9.4.8" }
44+
- { cabal: "3.14", os: windows-latest, ghc: "9.6.7" }
45+
- { cabal: "3.14", os: windows-latest, ghc: "9.8.4" }
46+
- { cabal: "3.14", os: windows-latest, ghc: "9.10.2" }
47+
- { cabal: "3.14", os: windows-latest, ghc: "9.12.2" }
4448
# MacOS
45-
- { cabal: "3.10", os: macOS-latest, ghc: "8.4.4" }
46-
- { cabal: "3.10", os: macOS-latest, ghc: "8.6.5" }
47-
- { cabal: "3.10", os: macOS-latest, ghc: "8.8.4" }
48-
- { cabal: "3.10", os: macOS-latest, ghc: "8.10.7" }
49-
- { cabal: "3.10", os: macOS-latest, ghc: "9.2.8" }
50-
- { cabal: "3.10", os: macOS-latest, ghc: "9.4.8" }
51-
- { cabal: "3.10", os: macOS-latest, ghc: "9.6.4" }
52-
- { cabal: "3.10", os: macOS-latest, ghc: "9.8.2" }
49+
- { cabal: "3.14", os: macOS-latest, ghc: "9.2.8" }
50+
- { cabal: "3.14", os: macOS-latest, ghc: "9.4.8" }
51+
- { cabal: "3.14", os: macOS-latest, ghc: "9.6.7" }
52+
- { cabal: "3.14", os: macOS-latest, ghc: "9.8.4" }
53+
- { cabal: "3.14", os: macOS-latest, ghc: "9.10.2" }
54+
- { cabal: "3.14", os: macOS-latest, ghc: "9.12.2" }
5355
fail-fast: false
5456

5557
steps:
@@ -59,7 +61,7 @@ jobs:
5961
echo M1 ${{ matrix.ghc }}
6062
echo M2 ${{ matrix.skip-bench }}
6163
# ----------------
62-
- uses: actions/checkout@v4
64+
- uses: actions/checkout@v5
6365
# ----------------
6466
- uses: haskell-actions/setup@v2
6567
id: setup-haskell-cabal
@@ -72,7 +74,7 @@ jobs:
7274
name: Cache ~/.cabal/store
7375
with:
7476
path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
75-
key: ${{ runner.os }}-${{ matrix.ghc }}--${{ github.Shah }}
77+
key: ${{ runner.os }}-${{ matrix.ghc }}--
7678
# ----------------
7779
- name: "Install PAPI"
7880
run: |
@@ -94,18 +96,22 @@ jobs:
9496
mkdir unpacked
9597
tar -C unpacked -xzf sdist/math-function*tar.gz
9698
cd unpacked
99+
mv math-functions-*/* .
97100
# ----------------
98101
- name: cabal check
99102
run: |
100103
cabal -vnormal check
104+
working-directory: unpacked/
101105
# ----------------
102106
- name: Build
103107
run: |
104108
if [ "${{ matrix.skip-test }}" == "" ]; then FLAG_TEST=--enable-test; fi
105109
if [ "${{ matrix.skip-bench }}" == "" ]; then FLAG_BENCH=--enable-benchmarks; fi
106110
cabal configure $FLAG_PAPI $FLAG_TEST $FLAG_BENCH --flags='${{matrix.flags}}'
107111
cabal build all --write-ghc-environment-files=always
112+
working-directory: unpacked/
108113
# ----------------
109114
- name: Test
110115
run: |
111116
cabal test all
117+
working-directory: unpacked/

.hgignore

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

.hgtags

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

README.markdown

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# math-functions: collection of tools for numeric computations
22

3-
[![Build Status](https://travis-ci.org/Shimuuar/math-functions.png?branch=master)](https://travis-ci.org/Shimuuar/math-functions)
4-
[![Build status](https://ci.appveyor.com/api/projects/status/6xexxj9g6rnbg2q4/branch/master?svg=true)](https://ci.appveyor.com/project/Shimuuar/math-functions/branch/master)
5-
63
This package provides collection of various tools for numeric
74
computations. Namely:
85

@@ -24,17 +21,12 @@ estimates for the algorithms used.
2421
# Get involved!
2522

2623
Please report bugs via the
27-
[github issue tracker](https://github.com/bos/math-functions/issues).
24+
[github issue tracker](https://github.com/haskell/math-functions/issues).
2825

29-
Master [git mirror](https://github.com/bos/math-functions):
26+
Master [git mirror](https://github.com/haskell/math-functions):
3027

3128
* `git clone git://github.com/bos/math-functions.git`
3229

33-
There's also a [Mercurial mirror](https://bitbucket.org/bos/math-functions):
34-
35-
* `hg clone https://bitbucket.org/bos/math-functions`
36-
37-
(You can create and contribute changes using either Mercurial or git.)
3830

3931

4032
# Authors

Setup.hs

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

math-functions.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extra-source-files:
4444

4545
source-repository head
4646
type: git
47-
location: https://github.com/bos/math-functions
47+
location: https://github.com/haskell/math-functions
4848

4949
flag system-expm1
5050
description: Use expm1 provided by GHC. On GHCJS we don't have one so we

0 commit comments

Comments
 (0)