Rename settings.yaml to gipeda.yaml (fixes #33)

diff --git a/.gitignore b/.gitignore
index 68f703d..1e3ee4a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ logs
 repository
 deploy.sh
 /log2csv
-/settings.yaml
+/gipeda.yaml
 site/js/bootstrap/
 site/js/flot/
 site/js/handlebars-v2.0.0.js

diff --git a/README.md b/README.md
index 872dbe9..1dbf1ed 100644 (file)
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Setting it up
 
         cabal install --bindir=.
 
- * Create a `settings.yaml`. You can look at the example file.
+ * Create a `gipeda.yaml`. You can look at the example file.
  * Clone the repository of your project into `repository/`. A bare clone is
    sufficient, e.g.
 

diff --git a/binary/gipeda.yaml b/binary/gipeda.yaml
new file mode 100644 (file)
index 0000000..b983732
--- /dev/null
+++ b/binary/gipeda.yaml
@@ -0,0 +1,21 @@
+title: Binary
+revisionInfo: '<a href="https://github.com/kolmodin/binary/commit/{{rev}}">GitHub</a>'
+diffLink: "https://github.com/kolmodin/binary/compare/{{base}}...{{rev}}"
+limitRecent: 20
+start: 4853c7b467409468ac9029558c8ed3caa4a4be6c
+
+benchmarks:
+  - match: "throughput/*"
+    smallerIsBetter: False
+    unit: MB/s
+    group: "Throughput measurements"
+
+  - match: "benchmark/*"
+    smallerIsBetter: True
+    unit: nano seconds
+    group: "Benchmarks"
+
+  - match: "build/warnings"
+    smallerIsBetter: True
+    unit: warnings
+    group: "Build"

diff --git a/binary/settings.yaml b/binary/settings.yaml
deleted file mode 100644 (file)
index b983732..0000000
--- a/binary/settings.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-title: Binary
-revisionInfo: '<a href="https://github.com/kolmodin/binary/commit/{{rev}}">GitHub</a>'
-diffLink: "https://github.com/kolmodin/binary/compare/{{base}}...{{rev}}"
-limitRecent: 20
-start: 4853c7b467409468ac9029558c8ed3caa4a4be6c
-
-benchmarks:
-  - match: "throughput/*"
-    smallerIsBetter: False
-    unit: MB/s
-    group: "Throughput measurements"
-
-  - match: "benchmark/*"
-    smallerIsBetter: True
-    unit: nano seconds
-    group: "Benchmarks"
-
-  - match: "build/warnings"
-    smallerIsBetter: True
-    unit: warnings
-    group: "Build"

diff --git a/example/gipeda.yaml b/example/gipeda.yaml
new file mode 100644 (file)
index 0000000..ae9e9ab
--- /dev/null
+++ b/example/gipeda.yaml
@@ -0,0 +1,19 @@
+title: Gipeda itself
+diffLink: "https://git.nomeata.org/?p=gipeda.git;a=commitdiff;h={{rev}};hp={{base}}"
+revisionInfo: '<a href="https://github.com/nomeata/gipeda/commit/{{rev}}">View Diff</a>'
+limitRecent: 20
+start: 65b3eede043ff5d4718724d220a82bbc8adc3280
+interestingTags: "*"
+
+benchmarks:
+  - match: "*"
+    smallerIsBetter: False
+    threshold: 1
+    type: integral
+    group: (ungrouped)
+  - match: "loc/*"
+    unit: lines of code
+    group: Lines of Code
+  - match: comment-rate
+    unit: percentags
+    group: Code quality

diff --git a/example/settings.yaml b/example/settings.yaml
deleted file mode 100644 (file)
index ae9e9ab..0000000
--- a/example/settings.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-title: Gipeda itself
-diffLink: "https://git.nomeata.org/?p=gipeda.git;a=commitdiff;h={{rev}};hp={{base}}"
-revisionInfo: '<a href="https://github.com/nomeata/gipeda/commit/{{rev}}">View Diff</a>'
-limitRecent: 20
-start: 65b3eede043ff5d4718724d220a82bbc8adc3280
-interestingTags: "*"
-
-benchmarks:
-  - match: "*"
-    smallerIsBetter: False
-    threshold: 1
-    type: integral
-    group: (ungrouped)
-  - match: "loc/*"
-    unit: lines of code
-    group: Lines of Code
-  - match: comment-rate
-    unit: percentags
-    group: Code quality

diff --git a/ghc/gipeda.yaml b/ghc/gipeda.yaml
new file mode 100644 (file)
index 0000000..b8ae279
--- /dev/null
+++ b/ghc/gipeda.yaml
@@ -0,0 +1,57 @@
+title: GHC Speed
+revisionInfo: '<a href="https://git.haskell.org/ghc.git/commitdiff/{{rev}}">View Diff</a> – <a href="https://phabricator.haskell.org/rGHC{{rev}}">Phab</a> – <a href="http://raw.githubusercontent.com/nomeata/ghc-speed-logs/master/{{rev}}.log">View buildlog</a>' 
+diffLink: "https://git.haskell.org/ghc.git/commitdiff/{{rev}}?hp={{base}}"
+limitRecent: 50
+start: 55e7ab1210975e6276f3cab3ac0e1f35bcd772f0
+interestingTags: "*-release"
+interestingBranches: "*"
+
+benchmarks:
+  - match: "*"
+    smallerIsBetter: True
+    threshold: 3
+    type: integral
+    group: (ungrouped)
+  - match: "testsuite/*"
+    unit: tests
+    type: small integral
+    group: Testsuite
+    important: False
+
+  - match: testsuite/tests
+    smallerIsBetter: False
+    type: integral
+  - match: testsuite/expected passes
+    smallerIsBetter: False
+    type: integral
+
+  - match: "parser/*"
+    unit: conflicts
+    type: small integral
+    group: Parser
+
+  - match: "nofib/size/*"
+    unit: bytes
+    group: Nofib sizes
+
+  - match: "nofib/allocs/*"
+    unit: bytes
+    group: Nofib allocations
+
+  - match: "nofib/time/*"
+    unit: seconds
+    group: Nofib runtimes
+    type: float
+
+  - match: "buildtime/*"
+    unit: seconds
+    group: Buildtimes
+    type: float
+
+  - match: "nofib/time/circsim"
+    threshold: 5
+
+  - match: "tests/alloc/*"
+    unit: bytes
+    group: Testsuite allocations
+

diff --git a/ghc/settings.yaml b/ghc/settings.yaml
deleted file mode 100644 (file)
index b8ae279..0000000
--- a/ghc/settings.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-title: GHC Speed
-revisionInfo: '<a href="https://git.haskell.org/ghc.git/commitdiff/{{rev}}">View Diff</a> – <a href="https://phabricator.haskell.org/rGHC{{rev}}">Phab</a> – <a href="http://raw.githubusercontent.com/nomeata/ghc-speed-logs/master/{{rev}}.log">View buildlog</a>' 
-diffLink: "https://git.haskell.org/ghc.git/commitdiff/{{rev}}?hp={{base}}"
-limitRecent: 50
-start: 55e7ab1210975e6276f3cab3ac0e1f35bcd772f0
-interestingTags: "*-release"
-interestingBranches: "*"
-
-benchmarks:
-  - match: "*"
-    smallerIsBetter: True
-    threshold: 3
-    type: integral
-    group: (ungrouped)
-  - match: "testsuite/*"
-    unit: tests
-    type: small integral
-    group: Testsuite
-    important: False
-
-  - match: testsuite/tests
-    smallerIsBetter: False
-    type: integral
-  - match: testsuite/expected passes
-    smallerIsBetter: False
-    type: integral
-
-  - match: "parser/*"
-    unit: conflicts
-    type: small integral
-    group: Parser
-
-  - match: "nofib/size/*"
-    unit: bytes
-    group: Nofib sizes
-
-  - match: "nofib/allocs/*"
-    unit: bytes
-    group: Nofib allocations
-
-  - match: "nofib/time/*"
-    unit: seconds
-    group: Nofib runtimes
-    type: float
-
-  - match: "buildtime/*"
-    unit: seconds
-    group: Buildtimes
-    type: float
-
-  - match: "nofib/time/circsim"
-    threshold: 5
-
-  - match: "tests/alloc/*"
-    unit: bytes
-    group: Testsuite allocations
-

diff --git a/src/BenchNames.hs b/src/BenchNames.hs
index 62cd7a1..5153797 100644 (file)
--- a/src/BenchNames.hs
+++ b/src/BenchNames.hs
@@ -16,7 +16,7 @@ import qualified BenchmarkSettings as S
 
 benchNamesMain :: [S.BenchName] -> IO ()
 benchNamesMain benchNames = do
-    settings <- S.readSettings "settings.yaml"
+    settings <- S.readSettings "gipeda.yaml"
 
     let groups =
             map (uncurry BenchGroup) $

diff --git a/src/GraphReport.hs b/src/GraphReport.hs
index 55f94f9..07db17c 100644 (file)
--- a/src/GraphReport.hs
+++ b/src/GraphReport.hs
@@ -17,7 +17,7 @@ import qualified BenchmarkSettings as S
 
 graphReportMain :: [String] -> IO ()
 graphReportMain (bench:revs) = do
-    settings <- S.readSettings "settings.yaml"
+    settings <- S.readSettings "gipeda.yaml"
 
     g <- forM revs $ \rev -> do
         json <- BS.readFile (reportOf rev)

diff --git a/src/JsonSettings.hs b/src/JsonSettings.hs
index 09cc4c2..cd8d1f8 100644 (file)
--- a/src/JsonSettings.hs
+++ b/src/JsonSettings.hs
@@ -9,6 +9,6 @@ import Data.Functor
 
 jsonSettingsMain :: IO ()
 jsonSettingsMain = do
-    s <- either (error.show) id <$> decodeFileEither "settings.yaml"
+    s <- either (error.show) id <$> decodeFileEither "gipeda.yaml"
     let o = object [ "settings" .= (s :: Object) ]
     BS.putStr (Data.Aeson.encode o)

diff --git a/src/RevReport.hs b/src/RevReport.hs
index e076f93..303c3a2 100644 (file)
--- a/src/RevReport.hs
+++ b/src/RevReport.hs
@@ -17,7 +17,7 @@ git args = cmd (words "git -C repository" ++ args)
 
 revReportMain :: [String] -> IO ()
 revReportMain (this:parents) = do
-    settings <- S.readSettings "settings.yaml"
+    settings <- S.readSettings "gipeda.yaml"
 
     thisM <- readCSV this
     parentM <- case parents of

diff --git a/src/Shake.hs b/src/Shake.hs
index 5447d78..169b64c 100644 (file)
--- a/src/Shake.hs
+++ b/src/Shake.hs
@@ -44,7 +44,7 @@ self name args = do
 
 gitRange :: Action [String]
 gitRange = do
-    s <- liftIO $ S.readSettings "settings.yaml"
+    s <- liftIO $ S.readSettings "gipeda.yaml"
     let first = S.start s
     heads <- readFileLines "site/out/heads.txt"
     Stdout range <- git "log" $ ["--format=%H","^"++first] ++ heads
@@ -117,8 +117,8 @@ shakeMain = do
 -}
 
     getLimitRecent <- addOracle $ \(LimitRecent _) -> do
-        need ["settings.yaml"]
-        S.limitRecent <$> liftIO (S.readSettings "settings.yaml")
+        need ["gipeda.yaml"]
+        S.limitRecent <$> liftIO (S.readSettings "gipeda.yaml")
 
     "reports" ~> do
         hashes <- gitRange
@@ -187,7 +187,7 @@ shakeMain = do
     "site/out/history.csv" *> \out -> do
         heads <- readFileLines "site/out/heads.txt"
 
-        s <- liftIO $ S.readSettings "settings.yaml"
+        s <- liftIO $ S.readSettings "gipeda.yaml"
         let first = S.start s
 
         Stdout stdout <- git "log" $
@@ -215,8 +215,8 @@ shakeMain = do
     "site/out/tags.txt" *> \ out -> do
         alwaysRerun
 
-        need ["settings.yaml"]
-        s <- liftIO $ S.readSettings "settings.yaml"
+        need ["gipeda.yaml"]
+        s <- liftIO $ S.readSettings "gipeda.yaml"
         case S.interestingTags s of
             Nothing ->
                 writeFileChanged out ""
@@ -228,8 +228,8 @@ shakeMain = do
     "site/out/branches.txt" *> \ out -> do
         alwaysRerun
 
-        need ["settings.yaml"]
-        s <- liftIO $ S.readSettings "settings.yaml"
+        need ["gipeda.yaml"]
+        s <- liftIO $ S.readSettings "gipeda.yaml"
         case S.interestingBranches s of
             Nothing ->
                 writeFileChanged out ""
@@ -339,7 +339,7 @@ shakeMain = do
         need [resultsOf latest]
         b <- liftIO $ benchmarksInCSVFile (resultsOf latest)
 
-        need ["settings.yaml"]
+        need ["gipeda.yaml"]
 
         Stdout json <- self "BenchNames" (nub b)
         writeFile' out json
@@ -360,7 +360,7 @@ shakeMain = do
     want ["site/out/all-summaries.json"]
 
     "site/out/settings.json" *> \out -> do
-        need ["settings.yaml"]
+        need ["gipeda.yaml"]
 
         Stdout json <- self "JsonSettings" []
         writeFile' out json

diff --git a/src/gipeda.hs b/src/gipeda.hs
index 2204228..b58e7ca 100644 (file)
--- a/src/gipeda.hs
+++ b/src/gipeda.hs
@@ -28,9 +28,9 @@ main = do
 
     args <- getArgs
 
-    ex <- doesFileExist "settings.yaml"
+    ex <- doesFileExist "gipeda.yaml"
     unless ex $ do
-        hPutStr stderr "Please run this from the same directory as the settings.yaml file.\n"
+        hPutStr stderr "Please run this from the same directory as the gipeda.yaml file.\n"
 
 
     case args of