From 4ef23fd0f504253b9bd6ee967645629bdcb4b450 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 Apr 2022 12:51:41 +0300 Subject: [PATCH 1/7] Try showing less snapshots #311 --- src/Handler/Package.hs | 2 +- src/Stackage/Database/Query.hs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Handler/Package.hs b/src/Handler/Package.hs index fad3c8f..e7b304a 100644 --- a/src/Handler/Package.hs +++ b/src/Handler/Package.hs @@ -157,7 +157,7 @@ getPackageSnapshotsR :: PackageNameP -> Handler Html getPackageSnapshotsR pn = track "Handler.Package.getPackageSnapshotsR" $ do cacheSeconds $ 60 * 60 * 24 - snapshots <- getSnapshotsForPackage pn Nothing + snapshots <- getLtsSnapshotsForPackage pn (Just 100) defaultLayout (do setTitle ("Packages for " >> toHtml pn) $(combineStylesheets 'StaticR [css_font_awesome_min_css]) diff --git a/src/Stackage/Database/Query.hs b/src/Stackage/Database/Query.hs index df7d7e8..9b4662a 100644 --- a/src/Stackage/Database/Query.hs +++ b/src/Stackage/Database/Query.hs @@ -638,15 +638,17 @@ stringToArray :: -> SqlExpr (Value [String]) stringToArray s1 s2 = unsafeSqlFunction "string_to_array" (s1, s2) -getSnapshotsForPackage +getLtsSnapshotsForPackage :: GetStackageDatabase env m => PackageNameP -> Maybe Int -> m [(CompilerP, SnapshotPackageInfo)] -getSnapshotsForPackage pname mlimit = +getLtsSnapshotsForPackage pname mlimit = fmap (first unValue) <$> run (snapshotPackageInfoQuery $ \_sp s pn _v spiQ -> do - where_ (pn ^. PackageNameName ==. val pname) + where_ $ + pn ^. PackageNameName ==. val pname &&. + (s ^. snapshotName `ilike` val "lts%") orderBy [desc (s ^. SnapshotCreated)] forM_ mlimit (limit . fromIntegral) pure (s ^. SnapshotCompiler, spiQ)) From 057dee56f47fa3db491b11f454d45804543723e8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 Apr 2022 12:56:52 +0300 Subject: [PATCH 2/7] Build on pull requests --- .github/workflows/runtime.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/runtime.yml b/.github/workflows/runtime.yml index d3da222..8aa67db 100644 --- a/.github/workflows/runtime.yml +++ b/.github/workflows/runtime.yml @@ -3,6 +3,7 @@ name: Runtime image on: push: branches: [master, bench] + pull_request: jobs: push: From c5847bb2a5c3cb31f4786ba6ea8ae37bca7660f7 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 Apr 2022 13:04:28 +0300 Subject: [PATCH 3/7] foo --- .github/workflows/runtime.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/runtime.yml b/.github/workflows/runtime.yml index 8aa67db..dc6d81f 100644 --- a/.github/workflows/runtime.yml +++ b/.github/workflows/runtime.yml @@ -2,8 +2,7 @@ name: Runtime image on: push: - branches: [master, bench] - pull_request: + branches: [master, bench, 311-less-snapshots] jobs: push: From 12462dff9533e4d1c2591dad284e8d2afff727fe Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 Apr 2022 13:13:21 +0300 Subject: [PATCH 4/7] bar --- src/Stackage/Database/Query.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Stackage/Database/Query.hs b/src/Stackage/Database/Query.hs index 9b4662a..b53eb19 100644 --- a/src/Stackage/Database/Query.hs +++ b/src/Stackage/Database/Query.hs @@ -648,7 +648,7 @@ getLtsSnapshotsForPackage pname mlimit = run (snapshotPackageInfoQuery $ \_sp s pn _v spiQ -> do where_ $ pn ^. PackageNameName ==. val pname &&. - (s ^. snapshotName `ilike` val "lts%") + (s ^. SnapshotName `ilike` val "lts%") orderBy [desc (s ^. SnapshotCreated)] forM_ mlimit (limit . fromIntegral) pure (s ^. SnapshotCompiler, spiQ)) From 3f7b64294706f23449db56d696c4e105ae6dc979 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 Apr 2022 13:31:29 +0300 Subject: [PATCH 5/7] Revert "bar" This reverts commit 12462dff9533e4d1c2591dad284e8d2afff727fe. --- src/Stackage/Database/Query.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Stackage/Database/Query.hs b/src/Stackage/Database/Query.hs index b53eb19..9b4662a 100644 --- a/src/Stackage/Database/Query.hs +++ b/src/Stackage/Database/Query.hs @@ -648,7 +648,7 @@ getLtsSnapshotsForPackage pname mlimit = run (snapshotPackageInfoQuery $ \_sp s pn _v spiQ -> do where_ $ pn ^. PackageNameName ==. val pname &&. - (s ^. SnapshotName `ilike` val "lts%") + (s ^. snapshotName `ilike` val "lts%") orderBy [desc (s ^. SnapshotCreated)] forM_ mlimit (limit . fromIntegral) pure (s ^. SnapshotCompiler, spiQ)) From f39c950448f0ce8c7abd64bb4a27f976e9a88205 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 Apr 2022 13:31:54 +0300 Subject: [PATCH 6/7] Revert "Try showing less snapshots #311" This reverts commit 4ef23fd0f504253b9bd6ee967645629bdcb4b450. --- src/Handler/Package.hs | 2 +- src/Stackage/Database/Query.hs | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Handler/Package.hs b/src/Handler/Package.hs index e7b304a..fad3c8f 100644 --- a/src/Handler/Package.hs +++ b/src/Handler/Package.hs @@ -157,7 +157,7 @@ getPackageSnapshotsR :: PackageNameP -> Handler Html getPackageSnapshotsR pn = track "Handler.Package.getPackageSnapshotsR" $ do cacheSeconds $ 60 * 60 * 24 - snapshots <- getLtsSnapshotsForPackage pn (Just 100) + snapshots <- getSnapshotsForPackage pn Nothing defaultLayout (do setTitle ("Packages for " >> toHtml pn) $(combineStylesheets 'StaticR [css_font_awesome_min_css]) diff --git a/src/Stackage/Database/Query.hs b/src/Stackage/Database/Query.hs index 9b4662a..df7d7e8 100644 --- a/src/Stackage/Database/Query.hs +++ b/src/Stackage/Database/Query.hs @@ -638,17 +638,15 @@ stringToArray :: -> SqlExpr (Value [String]) stringToArray s1 s2 = unsafeSqlFunction "string_to_array" (s1, s2) -getLtsSnapshotsForPackage +getSnapshotsForPackage :: GetStackageDatabase env m => PackageNameP -> Maybe Int -> m [(CompilerP, SnapshotPackageInfo)] -getLtsSnapshotsForPackage pname mlimit = +getSnapshotsForPackage pname mlimit = fmap (first unValue) <$> run (snapshotPackageInfoQuery $ \_sp s pn _v spiQ -> do - where_ $ - pn ^. PackageNameName ==. val pname &&. - (s ^. snapshotName `ilike` val "lts%") + where_ (pn ^. PackageNameName ==. val pname) orderBy [desc (s ^. SnapshotCreated)] forM_ mlimit (limit . fromIntegral) pure (s ^. SnapshotCompiler, spiQ)) From add86d441755396fc287668430386d614400a767 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 Apr 2022 13:32:12 +0300 Subject: [PATCH 7/7] Only show 50 entries --- src/Handler/Package.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Handler/Package.hs b/src/Handler/Package.hs index fad3c8f..76ac42c 100644 --- a/src/Handler/Package.hs +++ b/src/Handler/Package.hs @@ -157,7 +157,7 @@ getPackageSnapshotsR :: PackageNameP -> Handler Html getPackageSnapshotsR pn = track "Handler.Package.getPackageSnapshotsR" $ do cacheSeconds $ 60 * 60 * 24 - snapshots <- getSnapshotsForPackage pn Nothing + snapshots <- getSnapshotsForPackage pn (Just 50) defaultLayout (do setTitle ("Packages for " >> toHtml pn) $(combineStylesheets 'StaticR [css_font_awesome_min_css])