Skip to content

Commit

Permalink
CI overhaul (#120)
Browse files Browse the repository at this point in the history
* test

* Add some more GHC versions

* Add pre-commit checks and some other goodies

* missed some hooks there

* Exclude shell builds for now

* GHC 8.10 and 9.0 aren't in nixpkgs anymore?

* Get particular about build packages

* Don't torture garnix with too many packages

* fix glob

* Hardcode packages since globs are wimpy

* pre-commit checks

* turn off old checks

* Get checks to agree with each other
  • Loading branch information
iand675 authored May 29, 2024
1 parent 1a057f3 commit babc706
Show file tree
Hide file tree
Showing 53 changed files with 796 additions and 158 deletions.
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
dotenv
dotenv_if_exists .env.local
use flake . --override-input devenv-root "file+file://"<(printf %s "$PWD")
83 changes: 0 additions & 83 deletions .github/workflows/haskell.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ client_session_key.aes
.env.local
dist-newstyle/
.pre-commit-config.yaml
.devenv/
2 changes: 1 addition & 1 deletion api/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.stack-work/
*~
*~
2 changes: 1 addition & 1 deletion examples/hspec/hspec-example.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand Down
1 change: 0 additions & 1 deletion examples/yesod-minimal/otel-local-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ service:
receivers: [otlp]
processors: [batch]
exporters: [logging, otlp]

2 changes: 1 addition & 1 deletion examples/yesod-minimal/yesod-minimal.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand Down
2 changes: 1 addition & 1 deletion exporters/handle/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.stack-work/
*~
*~
2 changes: 1 addition & 1 deletion exporters/handle/hs-opentelemetry-exporter-handle.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand Down
2 changes: 1 addition & 1 deletion exporters/in-memory/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.stack-work/
*~
*~
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand Down
2 changes: 1 addition & 1 deletion exporters/jaeger/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.stack-work/
*~
*~
2 changes: 1 addition & 1 deletion exporters/jaeger/hs-opentelemetry-exporter-jaeger.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.stack-work/
*~
*~
2 changes: 1 addition & 1 deletion exporters/otlp/hs-opentelemetry-exporter-otlp.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand Down
2 changes: 1 addition & 1 deletion exporters/prometheus/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.stack-work/
*~
*~
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand Down
2 changes: 1 addition & 1 deletion exporters/zipkin/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.stack-work/
*~
*~
2 changes: 1 addition & 1 deletion exporters/zipkin/hs-opentelemetry-exporter-zipkin.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand Down
Loading

0 comments on commit babc706

Please sign in to comment.