Skip to content
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.

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

Chores #445

Merged
merged 38 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
032355c
add TypeOperators as suggested by warning
sorki Oct 22, 2023
b95690d
Shave off incomplete-uni-patterns warnings
sorki Oct 22, 2023
fb08e76
cabal.project.local.ci: wrap, add -Wunused-packages
sorki Oct 22, 2023
4e28145
cabal.project.local.ci: add -Wno-all-missed-specialisations
sorki Oct 22, 2023
e638bd1
Update CI
sorki Oct 22, 2023
80948ed
default.nix: bump nixpkgs revision to most recent 23.05
sorki Oct 22, 2023
700af8d
tests: import ~ type operator from Prelude
sorki Oct 22, 2023
fe88c36
Fix Show for Transform2
sorki Oct 25, 2023
674d678
Switch quaternionToEuler from tuple to V3 a
sorki Oct 25, 2023
a1f41f7
rmax, rmin: flip order of && clause
sorki Oct 26, 2023
b8d7379
Improve QuickCheck test result rendering
sorki Oct 30, 2023
835475d
tests: Add NaNFail constructor to Insidedness
sorki Oct 30, 2023
605d862
Fix empty intersection to be empty space
sorki Oct 30, 2023
016f06d
Drop `withRounding 0 = id`
sorki Oct 30, 2023
51bee56
Fix Show for Transform3
sorki Oct 30, 2023
94ce994
Add Foldable f constraint to Object obj f a class
sorki Oct 30, 2023
1dd0da4
Shave off some newlines from Primitives
sorki Oct 30, 2023
38d5340
Definitions: add hasZeroComponent, hasNaNComponent
sorki Oct 30, 2023
8d9239f
Reintroduce Qunatizable with pretty large epsilon
sorki Oct 30, 2023
19688d7
Add arbitraryNonZeroV, use for scale and scaling transform equality
sorki Oct 30, 2023
63209c2
Temporary: put guards into getImplicit*
sorki Oct 30, 2023
8a94b2a
CI: update ormolu workflow
sorki Oct 31, 2023
ec4c704
Drop scaling compaction
sorki Oct 31, 2023
36cbf1e
Use arbitraryInvertibleM33|M44 for generated transforms
sorki Oct 31, 2023
4f65423
Run QuickCheck Spec in parallel
sorki Oct 31, 2023
65e3fe5
Add goldenFormat2, add golden test for troublesome polygons
sorki Oct 31, 2023
732e809
Add hack that prevents generation of small polygons
sorki Oct 31, 2023
f831029
Drop allow-newer from cabal.project
sorki Oct 31, 2023
1bc3643
Make ormolu happy
sorki Oct 31, 2023
e05ce20
Make hlint happy
sorki Oct 31, 2023
d85d071
Add canonicalization pass
sorki Nov 5, 2023
2ad93fb
Disable 2*pi Rotate2 identity
sorki Nov 5, 2023
a4954d7
update .gitignore
sorki Nov 5, 2023
74f7ed4
Move more identities to canonShared
sorki Nov 5, 2023
d0a7ea4
Drop redundant guards from getImplicitShared
sorki Nov 5, 2023
1d2ca17
tests: GoldenSpec.Util clean-up
sorki Nov 7, 2023
e38d9bf
tests: group extopenscad tests under single describe
sorki Nov 7, 2023
f60ae09
Improve Show for EmbedBoxedObj to show box as well
sorki Nov 7, 2023
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
7 changes: 3 additions & 4 deletions .github/workflows/ci.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ in haskellCi.generalCi
haskellCi.matrixSteps
( Some
{ ghc =
[ haskellCi.GHC.GHC902
[ haskellCi.GHC.GHC947
, haskellCi.GHC.GHC902
, haskellCi.GHC.GHC8107
, haskellCi.GHC.GHC884
, haskellCi.GHC.GHC865
]
, cabal = [ haskellCi.Cabal.Cabal34 ]
, cabal = [ haskellCi.Cabal.Cabal310 ]
}
)
// { on = [ haskellCi.Event.push
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
steps:
- uses: "actions/checkout@v3"
- id: setup-haskell-cabal
uses: "haskell/actions/setup@v2"
uses: "haskell-actions/setup@v2"
with:
cabal-version: "${{ matrix.cabal }}"
enable-stack: false
Expand All @@ -17,7 +17,7 @@ jobs:
cp cabal.project.local.ci cabal.project.local
fi
- name: freeze
run: cabal freeze
run: cabal freeze --enable-tests --enable-benchmarks
- uses: "actions/cache@v3"
with:
key: "${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}"
Expand All @@ -35,12 +35,11 @@ jobs:
strategy:
matrix:
cabal:
- '3.4'
- '3.10'
ghc:
- '9.4.7'
- '9.0.2'
- '8.10.7'
- '8.8.4'
- '8.6.5'
name: Haskell CI
on:
- push
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/ormolu.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
# FUTUREWORK: add this to `ci.dhall`?
# TODO(srk): ^^

name: Ormolu
on:
- pull_request

jobs:
ormolu:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- uses: "actions/checkout@v1"
- uses: "actions/checkout@v3"

- uses: "actions/setup[email protected]"
- uses: "haskell-actions/setup@v2"
id: setup-haskell-cabal
with:
cabal-version: "${{ matrix.cabal }}"
enable-stack: false
ghc-version: "${{ matrix.ghc }}"

- uses: "actions/cache@v2"
- uses: "actions/cache@v3"
name: Cache
with:
key: "${{ runner.os }}"
Expand Down Expand Up @@ -46,6 +47,6 @@ jobs:
strategy:
matrix:
cabal:
- '3.2'
- '3.10'
ghc:
- '8.10.1'
- '9.4.7'
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
*.stl
!tests/golden/*.stl
*.svg
*.ascii.stl
*.asciistl
*.three.js
*.threejs
*.obj
# Generated by the build process
cabal.project.local
Setup
Expand All @@ -36,3 +41,8 @@ Examples/example[0-9][0-9]
/.settings
/.project
stack.yaml.lock
/attic/
# direnv
.envrc
.ghci
.ghci_history
Loading