Skip to content

Commit

Permalink
Update actions & other chores
Browse files Browse the repository at this point in the history
  • Loading branch information
rdipardo committed Jun 7, 2021
1 parent 670f504 commit 1d3b854
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -15,11 +15,11 @@ jobs:
submodules: 'recursive'
fetch-depth: 0
- name: Pre-test install
uses: actions/setup-dotnet@v1.7.2
uses: actions/setup-dotnet@v1.8.0
with:
dotnet-version: '5.0.202'
- name: Cache packages
uses: actions/cache@v2.1.5
uses: actions/cache@v2.1.6
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('src/Fornax.Seo/Directory.Build.props') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nuget.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
submodules: 'recursive'
fetch-depth: 0
- name: Pre-build Install
uses: actions/setup-dotnet@v1.7.2
uses: actions/setup-dotnet@v1.8.0
with:
dotnet-version: '5.0.202'
- name: Build package
Expand All @@ -40,11 +40,11 @@ jobs:
submodules: 'recursive'
fetch-depth: 0
- name: Pre-build Install
uses: actions/setup-dotnet@v1.7.2
uses: actions/setup-dotnet@v1.8.0
with:
dotnet-version: '5.0.202'
- name: Cache packages
uses: actions/cache@v2.1.5
uses: actions/cache@v2.1.6
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('src/Fornax.Seo/Directory.Build.props') }}
Expand Down
10 changes: 5 additions & 5 deletions README.md
Expand Up @@ -29,7 +29,7 @@ A SEO meta tag generator for [Fornax](https://ionide.io/Tools/fornax.html)

**IMPORTANT**

- Add the root domain of your website to a global instance of `Fornax.Core.Model.SiteContents`:
- Provide the root domain of your website:

~~~fsharp
// loaders/globalloader.fsx
Expand All @@ -43,7 +43,7 @@ type SiteInfo = {
}
~~~

- add personal authorship details, e.g.:
- Add personal authorship details, e.g.:

~~~fsharp
// loaders/globalloader.fsx
Expand Down Expand Up @@ -155,18 +155,18 @@ let layout (ctx: SiteContents) (active: string) (content: HtmlElement seq) =
| Some info -> info
| _ ->
{ ContentObject.Default with
Title = title
Title = pageTitle
Description = tagline
BaseUrl = siteRoot
SiteName = Some title
SiteName = Some pageTitle
Headline = Some tagline
Author = siteAuthor }
html [] [
head [] [
meta [ CharSet "utf-8" ]
meta [ Name "viewport"; Content "width=device-width, initial-scale=1" ]
title [] [ !!"My Blog" ]
title [] [ !!pageTitle ]
// . . .
yield! seo pageMeta
]
Expand Down
4 changes: 2 additions & 2 deletions scripts/pack.cmd
Expand Up @@ -6,14 +6,14 @@ SET NL=^

dotnet fsi /exec scripts/release-notes.fsx

DIR /B release\notes.txt >NUL
DIR /B release\notes.txt 2>NUL
IF NOT %ERRORLEVEL% == 0 (GOTO END)

FOR /F "tokens=* USEBACKQ" %%F IN (`type release\notes.txt`) DO (
SET "PackageReleaseNotes=%%F"
)

git describe --tags >NUL
git describe --tags 2>NUL
IF NOT %ERRORLEVEL% == 0 (
FOR /F "tokens=* USEBACKQ" %%F IN (`git rev-parse --short HEAD`) DO (
SET "BUILD_NUMBER=--version-suffix %%F"
Expand Down
2 changes: 1 addition & 1 deletion src/Fornax

0 comments on commit 1d3b854

Please sign in to comment.