Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
niltor committed Jul 31, 2024
2 parents 8547a0b + 62cb3cc commit 144daf8
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 2 deletions.
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Use GitHub Actions to automate the deployment of your blog site.
Create a `build.yml` file in the root directory of the repository, under the `.github/workflows` directory (if it doesn't exist, create it manually). The content should be as follows:

```yml
name: Deploy static content to Pages
name: Deploy static content to Pages
on:
push:
branches: ["main"]
Expand All @@ -134,6 +134,14 @@ jobs:
- name: Setup Pages
uses: actions/configure-pages@v4

- name: Dotnet Setup
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.x

- run: dotnet tool install -g Ater.EasyBlog --version 1.0.0-beta1
- run: ezblog build ./Content ./_site

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
Expand Down
8 changes: 8 additions & 0 deletions README_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,14 @@ jobs:
- name: Setup Pages
uses: actions/configure-pages@v4

- name: Dotnet Setup
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.x

- run: dotnet tool install -g Ater.EasyBlog --version 1.0.0-beta1
- run: ezblog build ./Content ./_site

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion src/BuildSite/webinfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"Name": "Ater Blog",
"Description": "My Blog - Powered by Ater Blog",
"AuthorName": "Ater",
"BaseHref": "/",
"BaseHref": "/EasyBlog/",
"Domain": null
}
17 changes: 17 additions & 0 deletions src/NodePackage/NodePackage.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutDir>bin</OutDir>
<NodeApiAssemblyJSModuleType>esm</NodeApiAssemblyJSModuleType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.JavaScript.NodeApi.Generator" Version="0.7.34" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\BuildSite\BuildSite.csproj" />
</ItemGroup>
</Project>
25 changes: 25 additions & 0 deletions src/NodePackage/NodePackage.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.002.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodePackage", "NodePackage.csproj", "{53E73CF5-3272-4B17-AC9C-A1D5C3CE4A7E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{53E73CF5-3272-4B17-AC9C-A1D5C3CE4A7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53E73CF5-3272-4B17-AC9C-A1D5C3CE4A7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53E73CF5-3272-4B17-AC9C-A1D5C3CE4A7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53E73CF5-3272-4B17-AC9C-A1D5C3CE4A7E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {226C8589-FEB8-4E53-A720-8376D02F6A5B}
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions src/NodePackage/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#!/usr/bin/env node
11 changes: 11 additions & 0 deletions src/NodePackage/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "ater.ezblog",
"version": "0.1.0",
"description": "Generates a pure static blog website from a markdown document through commands",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "NilTor",
"license": "MIT"
}

0 comments on commit 144daf8

Please sign in to comment.