Merge branch 'hakyll' into html-refactor

Author: david-christiansen

.github/workflows/main.yml

@@ -28,17 +28,17 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: haskell/actions/setup@v1
+      - uses: haskell/actions/setup@v2
         name: Setup Haskell Stack
         with:
           ghc-version: ${{ matrix.ghc }}
           stack-version: ${{ matrix.stack }}
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v3
         name: Cache ~/.stack
         with:
           path: ~/.stack

assets/css/main.css

@@ -12,13 +12,40 @@ We are excited to announce the **2023 GHC Contributors' Workshop, June 7-9 2023*
 
 In this three-day event, held on the lakeside campus of OST in lovely Rapperswil, Switzerland, you can learn what you need to know in order to get started working on GHC, right from the core team itself. Because the workshop is immediately prior to [Zurihac 2023](https://zfoh.ch/zurihac2023/), there will be time to work on your project and ask questions.
 
+## The Workshop
+
 At this workshop, you can learn the ins and outs of working on GHC, including practical techniques for minimizing rebuilds and diagnosing compiler bugs. The fundamental concepts and idioms of key compiler subsystems will be presented, along with tips and tricks for understanding how they are working in a running compiler. This is a practical workshop: any theory presented will be in service of building things, and we expect that you will arrive with a checkout and build of the source tree ready to go.
 
 Additionally, the speakers will be available to answer questions and to provide mentorship during Zurihac itself, so this is a great opportunity to finish your first MR.
 
 We expect that participants already know Haskell and have worked on some form of programming language implementation in the past, whether as students, at work, or just for fun. Concepts such as parsing, type checking, unification, and code generation should be familiar, but we don't expect participants to already be experts.
 
-So far, Simon Peyton Jones has confirmed that he will present at the workshop. Watch this space for more presenters as we confirm them!
+## Presenters
+
+The workshop will be instructed by seasoned contributors to GHC. So far, we have confirmed that the following GHC developers will present.l
+
+### Simon Peyton Jones
+
+Simon is an Engineering Fellow at Epic Games. Until 2022, he was a researcher at Microsoft Research in Cambridge, England, where he started in 1998. He’s also an Honorary Professor of the Computing Science Department at Glasgow University, where he was a professor during 1990-1998. Simon is interested in the design, implementation, and application of lazy functional languages. He was one of the original designers of Haskell, and much of his work is focused around the Glasgow Haskell Compiler and its ramifications. Simon's earlier work was instrumental in discovering how to generate efficient code for lazy languages on stock hardware, but today, he focuses on the GHC type checker, constraint solver, and simplifier.
+
+### Ben Gamari
+
+Ben has been contributing to GHC for over a decade and been working as a full-time compiler engineer at Well-Typed since 2015. In that time he has worked across the compiler, from parsing to code generation to release management and development infrastructure. His contributions include GHC's non-moving concurrent garbage collector, GHC's type-reflection implementation, and numerous improvements in profiling. He tends to find himself working near the back end of GHC's compilation pipeline and runtime system.
+
+### Sylvain Henry
+
+Sylvain has a background in high-performance computing and has been contributing to GHC since 2015. He joined IOG in 2019 to work full-time on GHC. Since 2022, he has led a small team of engineers working on improving Haskell tooling. His contributions include `ghc-bignum` (an improved implementation of GHC's support for big numbers), improvements to GHC's constant-folding capabilities, various fixes to the RTS, and a lot of refactoring to make GHC's code more modular and to make GHC a better cross-compiler. In 2022, his team added a new JavaScript backend to GHC, adapted from GHCJS.
+
+### Cheng Shao
+
+Cheng Shao is a full-time software engineer at Tweag, where he has been working since 2018. His main contribution to GHC is the WebAssembly backend, which grew out of his early research project, a Haskell-to-WebAssembly compiler codenamed Asterius. He focuses on maintaining the GHC WebAssembly backend, adding new functionality, as well as other GHC work that involves code generation and the runtime system.
+
+### Ryan Scott
+
+Ryan has contributed to GHC since 2015, and has worked on type class deriving, Template Haskell, pattern-match coverage checking, and various odds and ends in the type checker. He has worked as a research engineer at [Galois, Inc.](https://galois.com/) since 2020, where he works on a variety of program analysis tools such as [Cryptol](https://cryptol.net/), [Crux](https://crux.galois.com/), and [SAW](https://saw.galois.com/). In addition, Ryan maintains a large number of libraries on Hackage, and as a result, he contributes to the maintenance of [head.hackage](https://gitlab.haskell.org/ghc/head.hackage), which makes it possible to check if upcoming changes to GHC will affect the code that he maintains.
+
+
+## Participation
 
 Due to space constraints and to enable scholarships for student participants, there will be a fee for full on-site participation.
 Fees will be used to cover travel costs for presenters and students who don't have other funding to attend.

events/2023-ghc-development-workshop.markdown

@@ -0,0 +1,8 @@
+---
+title: Ben Gamari 
+episode: 23
+buzzsproutId: 12492098
+recorded: 2023-01-30
+published: 2023-03-22
+---
+In this episode Wouter Swierstra and Joachim Breitner chat with Ben Gamari. Ben is a consultant at Well-Typed known for his work at GHC. Ben tells us a little bit about his switch from Python to Haskell but not because he was missing the static typing, how programming his thermostat lead him to a career in the compiler development, and what it's like to be a GHC force multiplier.  

podcast/23/index.markdown

@@ -0,0 +1,9 @@
+* [Ben's website](http://smart-cactus.org/~ben/)
+* [Ben's Twitter](https://twitter.com/bgamari)
+* [Ben's GitHub](https://github.com/bgamari)
+* [Ben at Well-Typed](https://well-typed.com/people/ben/)
+* [GHC's Garbage Collector](http://www.smart-cactus.org/~ben/posts/2018-11-18-nonmoving-gc-for-ghc.html)
+* [Mark and Sweep Collectors](https://www.geeksforgeeks.org/mark-and-sweep-garbage-collection-algorithm/)
+* [GHC proposals](https://github.com/ghc-proposals/ghc-proposals)
+* [Stack Traces in Haskell](https://www.arashrouhani.com/papers/master-thesis.pdf)
+* [GHC Profilers](https://www.youtube.com/watch?v=vCv1vnY87NI&ab_channel=TNGTechnologyConsultingGmbH)

podcast/23/links.markdown

@@ -41,7 +41,7 @@ main = hakyll $ do
         route idRoute
         compile $ do
             sponsors <- buildBoilerplateCtx (Just "Sponsorship")
-            iks <- loadAll "donations/inkind/*.markdown"
+            iks <- loadAll ("donations/inkind/*.markdown" .&&. hasNoVersion)
 
             let ctx =
                     listField "inkinds" defaultContext (return iks) <>
@@ -69,7 +69,7 @@ main = hakyll $ do
         route idRoute
         compile $ do
             sponsors <- buildBoilerplateCtx (Just "Affiliates")
-            ctx <- affiliatesCtx . sortOn itemIdentifier <$> loadAll "affiliates/*.markdown"
+            ctx <- affiliatesCtx . sortOn itemIdentifier <$> loadAll ("affiliates/*.markdown" .&&. hasNoVersion)
 
             makeItem ""
                 >>= loadAndApplyTemplate "templates/affiliates/list.html"   ctx
@@ -125,7 +125,7 @@ main = hakyll $ do
         route idRoute
         compile $ do
             sponsors <- buildBoilerplateCtx (Just "Press")
-            press <- recentFirst =<< loadAll "press/*.markdown"
+            press <- recentFirst =<< loadAll ("press/*.markdown" .&&. hasNoVersion)
 
             let ctx =
                     listField "press_articles" defaultContext (return press) <>
@@ -142,7 +142,7 @@ main = hakyll $ do
         route idRoute
         compile $ do
             sponsors <- buildBoilerplateCtx (Just "FAQ")
-            ctx <- faqCtx <$> loadAll "faq/*.markdown"
+            ctx <- faqCtx <$> loadAll ("faq/*.markdown" .&&. hasNoVersion)
 
             makeItem ""
                 >>= loadAndApplyTemplate "templates/faq/list.html"      ctx
@@ -155,7 +155,7 @@ main = hakyll $ do
         route idRoute
         compile $ do
             sponsors <- buildBoilerplateCtx (Just "Who We Are")
-            ctx <- whoWeAreCtx <$> loadAll "who-we-are/people/*.markdown"
+            ctx <- whoWeAreCtx <$> loadAll ("who-we-are/people/*.markdown" .&&. hasNoVersion)
 
             makeItem ""
                 >>= loadAndApplyTemplate "templates/who-we-are/exec-and-board.html" ctx
@@ -166,7 +166,7 @@ main = hakyll $ do
         route idRoute
         compile $ do
             sponsors <- buildBoilerplateCtx (Just "Past Boards")
-            ctx <- whoWeAreCtx <$> loadAll "who-we-are/people/*.markdown"
+            ctx <- whoWeAreCtx <$> loadAll ("who-we-are/people/*.markdown" .&&. hasNoVersion)
 
             makeItem ""
                 >>= loadAndApplyTemplate "templates/who-we-are/past-board.html" ctx
@@ -247,7 +247,7 @@ main = hakyll $ do
         compile $ do
             sponsors <- buildBoilerplateCtx (Just "Haskell Foundation")
             podcastsCtx <- podcastListCtx . take 1 . reverse . sortOn podcastOrd <$> loadAll ("podcast/*/index.markdown" .&&. hasVersion "raw")
-            careers <- loadAll @String "careers/*.markdown"
+            careers <- loadAll @String ("careers/*.markdown" .&&. hasNoVersion)
             careersCtx <- careersCtx . reverse <$> loadAll "careers/*.markdown"
             announces  <- take 1 <$> (recentFirst =<< loadAll @String ("news/*/**.markdown" .&&. hasNoVersion))
             let announceCtx = announcementsCtx announces
@@ -274,7 +274,7 @@ main = hakyll $ do
         route idRoute
         compile $ do
             sponsors <- buildBoilerplateCtx (Just "Resources")
-            resources <- loadAll "resources/*.markdown"
+            resources <- loadAll ("resources/*.markdown" .&&. hasNoVersion)
 
             let ctx =
                     listField "resources" defaultContext (return resources) <>
@@ -300,8 +300,8 @@ main = hakyll $ do
         route idRoute
         compile $ do
             sponsors <- buildBoilerplateCtx (Just "Careers")
-            ctx <- careersCtx <$> loadAll "careers/*.markdown"
-            hiringSponsors <- hiringSponsorsCtx <$> loadAll "donations/sponsors/*.markdown"
+            ctx <- careersCtx <$> loadAll ("careers/*.markdown" .&&. hasNoVersion)
+            hiringSponsors <- hiringSponsorsCtx <$> loadAll ("donations/sponsors/*.markdown" .&&. hasNoVersion)
 
             makeItem ""
                 >>= loadAndApplyTemplate "templates/careers/list.html" (ctx <> hiringSponsors)
@@ -329,7 +329,8 @@ main = hakyll $ do
 -- sponsors --------------------------------------------------------------------------------------------
 
 buildBoilerplateCtx :: Maybe String -> Compiler (Context String)
-buildBoilerplateCtx mtitle = boilerPlateCtx mtitle . sortOn itemIdentifier <$> loadAll "donations/sponsors/*.markdown"
+buildBoilerplateCtx mtitle =
+    boilerPlateCtx mtitle . sortOn itemIdentifier <$> loadAll ("donations/sponsors/*.markdown" .&&. hasNoVersion)
 
 -- | Partition sponsors into by level: monad, applicative, and functor
 -- Sponsors are listed in the footer template, which means we need this

site.hs

@@ -1,5 +1,5 @@
 <div class="bg-white border border-gray-300 rounded py-8 px-6 sm:px-12 text-center">
-  <div class="bg-gray-100 px-6 sm:px-12 lg:px-16 py-6 lg:py-24">
+  <div class="bg-gray-100 px-6 sm:px-12 lg:px-16 py-6 lg:py-24 h-full">
     <div class="space-y-4">
       <h2 class="font-normal text-xl"><a class="arrow-link" href="$url$">$title$</a></h2>
       <p>$summary$</p>

templates/careers/tile.html

@@ -1,5 +1,5 @@
 <div class="bg-white border border-gray-300 rounded py-8 px-6 sm:px-12 text-center">
-  <div class="bg-gray-100 px-6 sm:px-12 lg:px-16 py-6 lg:py-24">
+  <div class="bg-gray-100 px-6 sm:px-12 lg:px-16 py-6 lg:py-24 h-full">
     <div class="space-y-4">
       <h2 class="text-center text-2xl-4xl font-normal">$title$</h2>
       <p>$summary$</p>

templates/events/tile.html

@@ -28,21 +28,20 @@ <h3 class="mb-4 text-xl text-gray-500">Amplify Haskell’s impact on humanity.</
       $partial("templates/news/frontpage.html")$
       $endfor$
       $endif$
-
       $for(episodes)$
-      <div class="bg-white border border-gray-300 rounded py-8 px-6 sm:px-12 text-center">
-        <div class="bg-gray-100 px-6 sm:px-12 lg:px-16 py-6 lg:py-24">
-          <h2 class="text-center text-2xl-4xl font-normal">
-            <b>$episode$</b> – $title$
-          </h2>
-          <div class="mt-8  space-y-8 max-w-2xl mx-auto">
-            $body$
-            <div class="mt-4">
-              <a class="arrow-link" href="/podcast/$episode$">&gt;&gt; Listen to $title$</a>
+        <div class="bg-white border border-gray-300 rounded py-8 px-6 sm:px-12 text-center">
+          <div class="bg-gray-100 px-6 sm:px-12 lg:px-16 py-6 lg:py-24 h-full">
+            <h2 class="text-center text-2xl-4xl font-normal">
+              <b>$episode$</b> – $title$
+            </h2>
+            <div class="mt-8  space-y-8 max-w-2xl mx-auto">
+              $body$
+              <div class="mt-4">
+                <a class="arrow-link" href="/podcast/$episode$">&gt;&gt; Listen to $title$</a>
+              </div>
             </div>
           </div>
         </div>
-      </div>
       $endfor$
 
       $if(events)$

templates/homepage.html

@@ -1,5 +1,5 @@
 <div class="bg-white border border-gray-300 rounded py-8 px-6 sm:px-12 text-center">
-  <div class="bg-gray-100 px-6 sm:px-12 lg:px-16 py-6 lg:py-24">
+  <div class="bg-gray-100 px-6 sm:px-12 lg:px-16 py-6 lg:py-24 h-full">
     <div class="space-y-4">
       <h2 class="text-center text-2xl-4xl font-normal">$title$</h2>
       <p>$body$</p>