Merge pull request #63 from fsbolero/github-actions

Switch from AppVeyor to GitHub actions
fsbolero · Aug 23, 2023 · b1fc335 · b1fc335
2 parents 5f6e587 + 4595c98
commit b1fc335
Show file tree

Hide file tree

Showing 21 changed files with 450 additions and 208 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "dotnet-serve": {
-      "version": "1.6.0",
+      "version": "1.10.172",
       "commands": [
         "dotnet-serve"
       ]

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,54 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - '**'
+    pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodule: recursive
+
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '7.0.100'
+
+      - name: Install dependencies
+        run: ./tools/install.ps1
+
+      - name: Build site
+        run: |
+          pushd src/Website
+          npm run sass
+          popd
+          dotnet build -c Release
+
+      - name: Build Bolero
+        run: |
+          git submodule update --init --recursive
+          pushd ref/bolero
+          git checkout master
+          git pull
+          ./build.ps1 -t build -c Debug
+          popd
+
+      - name: Generate reference documentation
+        run: ./tools/gen-refdoc.ps1
+
+      - name: Publish
+        uses: cpina/github-action-push-to-another-repository@main
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+        with:
+          source-directory: build
+          destination-github-username: fsbolero
+          destination-repository-name: fsbolero.github.io
+          user-email: [email protected]
+          target-branch: master
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@ bin/
 obj/
 build/
 *.user
-/src/Website/css/all*.css
+/src/Website/css/all*.css*
 /src/Website/js/
 paket-files/
 packages/

diff --git a/README.md b/README.md
@@ -1,7 +1,5 @@
 # Bolero website
 
-[![Build status](https://ci.appveyor.com/api/projects/status/ww05qe1heu29fnyq/branch/master?svg=true)](https://ci.appveyor.com/project/IntelliFactory/website)
-
 This is the source for the website [fsbolero.io](https://fsbolero.io).
 
 It also contains the Bolero documentation, under [src/Website/docs](src/Website/docs).

diff --git a/Website.sln b/Website.sln
@@ -15,7 +15,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6F6D1A5F-6236-4768-B4B0-37CC276ACE4E}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		appveyor.yml = appveyor.yml
 		README.md = README.md
 	EndProjectSection
 EndProject

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/paket.dependencies b/paket.dependencies
@@ -3,7 +3,6 @@ storage: none
 framework: netstandard2.0
 
 nuget FSharp.Core
-nuget BuildWebCompiler
 nuget FSharp.Text.RegexProvider
 nuget Markdig
 nuget WebSharper

diff --git a/paket.lock b/paket.lock
@@ -2,38 +2,13 @@ STORAGE: NONE
 RESTRICTION: == netstandard2.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    BuildWebCompiler (1.12.405)
     FSharp.Core (6.0.3)
     FSharp.Text.RegexProvider (2.1)
       FSharp.Core (>= 4.3.4)
     HtmlAgilityPack (1.11.42)
     Markdig (0.28.1)
       System.Memory (>= 4.5.4)
-    Microsoft.AspNetCore.Http.Abstractions (2.2)
-      Microsoft.AspNetCore.Http.Features (>= 2.2)
-      System.Text.Encodings.Web (>= 4.5)
-    Microsoft.AspNetCore.Http.Features (5.0.16)
-      Microsoft.Extensions.Primitives (>= 5.0.1)
-      System.IO.Pipelines (>= 5.0.2)
-    Microsoft.AspNetCore.Mvc.Abstractions (2.2)
-      Microsoft.AspNetCore.Routing.Abstractions (>= 2.2)
-      Microsoft.Net.Http.Headers (>= 2.2)
-    Microsoft.AspNetCore.Routing.Abstractions (2.2)
-      Microsoft.AspNetCore.Http.Abstractions (>= 2.2)
-    Microsoft.Extensions.Primitives (6.0)
-      System.Memory (>= 4.5.4)
-      System.Runtime.CompilerServices.Unsafe (>= 6.0)
-    Microsoft.Net.Http.Headers (2.2.8)
-      Microsoft.Extensions.Primitives (>= 2.2)
-      System.Buffers (>= 4.5)
     System.Buffers (4.5.1)
-    System.Configuration.ConfigurationManager (6.0)
-      System.Security.Cryptography.ProtectedData (>= 6.0)
-      System.Security.Permissions (>= 6.0)
-    System.IO.Pipelines (6.0.2)
-      System.Buffers (>= 4.5.1)
-      System.Memory (>= 4.5.4)
-      System.Threading.Tasks.Extensions (>= 4.5.4)
     System.Memory (4.5.4)
       System.Buffers (>= 4.5.1)
       System.Numerics.Vectors (>= 4.4)
@@ -43,31 +18,19 @@ NUGET
     System.Reflection.Emit.Lightweight (4.7)
       System.Reflection.Emit.ILGeneration (>= 4.7)
     System.Runtime.CompilerServices.Unsafe (6.0)
-    System.Security.AccessControl (6.0)
-      System.Security.Principal.Windows (>= 5.0)
-    System.Security.Cryptography.ProtectedData (6.0)
-      System.Memory (>= 4.5.4)
-    System.Security.Permissions (6.0)
-      System.Security.AccessControl (>= 6.0)
-    System.Security.Principal.Windows (5.0)
-    System.Text.Encodings.Web (6.0)
-      System.Buffers (>= 4.5.1)
-      System.Memory (>= 4.5.4)
-      System.Runtime.CompilerServices.Unsafe (>= 6.0)
-    System.Threading.Tasks.Extensions (4.5.4)
-      System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
-    WebSharper (5.0.0.120)
-      FSharp.Core (>= 5.0)
-      Microsoft.AspNetCore.Mvc.Abstractions (>= 2.0)
-      System.Configuration.ConfigurationManager (>= 5.0)
+    WebSharper (6.1.5.317)
+      FSharp.Core (>= 6.0)
       System.Reflection.Emit.Lightweight (>= 4.7)
-    WebSharper.FSharp (5.0.0.120)
-      WebSharper (5.0.0.120)
-    WebSharper.HighlightJS (5.0.0.120)
-      WebSharper (>= 5.0 < 5.1)
-    WebSharper.UI (5.0.0.120)
+    WebSharper.FSharp (6.1.5.317)
+      WebSharper (6.1.5.317)
+    WebSharper.HighlightJS (6.1.0.269)
+      WebSharper (>= 6.1.3 < 6.2)
+    WebSharper.MathJS (6.1.5.317)
+      WebSharper (6.1.5.317)
+    WebSharper.UI (6.1.4.317)
       HtmlAgilityPack (>= 1.11)
-      WebSharper (>= 5.0 < 5.1)
+      WebSharper (>= 6.1.5 < 6.2)
+      WebSharper.MathJS (>= 6.1.5 < 6.2)
     YamlDotNet (11.2.1)
 
 GROUP fsformatting

diff --git a/ref/bolero b/ref/bolero
diff --git a/src/Client/Client.fs b/src/Client/Client.fs
@@ -12,7 +12,7 @@ module Highlight =
     [<Require(typeof<Resources.Styles.Vs>)>]
     let Run() =
         JS.Document.QuerySelectorAll("code[class^=language-]").ForEach(
-            (fun (node, _, _, _) -> Hljs.HighlightBlock(node)),
+            (fun (node, _, _, _) -> Hljs.HighlightElement(node)),
             JS.Undefined
         )
 

diff --git a/src/Client/Client.fsproj b/src/Client/Client.fsproj
@@ -2,7 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <WebSharperProject>Bundle</WebSharperProject>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Client.fs" />

diff --git a/src/Client/wsconfig.json b/src/Client/wsconfig.json
@@ -1,5 +1,5 @@
 {
   "$schema": "https://websharper.com/wsconfig.schema.json",
-  "project": "bundle",
+  "project": "spa",
   "outputDir": "../Website/js"
 }
diff --git a/src/Website/compilerconfig.json b/src/Website/compilerconfig.json
diff --git a/src/Website/compilerconfig.json.defaults b/src/Website/compilerconfig.json.defaults
diff --git a/src/Website/index.html b/src/Website/index.html
@@ -7,7 +7,7 @@
   <link rel="icon" type="image/png" href="/img/favicon-16x16.png" sizes="16x16">
   <link rel="icon" type="image/png" href="/img/favicon-32x32.png" sizes="32x32">
   <meta ws-replace="meta" />
-  <link rel="stylesheet" href="/css/all${ReleaseMin}.css" />
+  <link rel="stylesheet" href="/css/all.css" />
   <link rel="stylesheet" href="/docs/content/fsdocs-default.css" />
   <link rel="stylesheet" href="/docs/content/fsdocs-custom.css" />
   <script ws-replace="Head"></script>