Skip to content

Commit

Permalink
Merge branch 'main' of github.com:pureblazor/components
Browse files Browse the repository at this point in the history
  • Loading branch information
codymullins committed Mar 22, 2024
2 parents 63121f9 + 5e636a8 commit 144788b
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 40 deletions.
61 changes: 30 additions & 31 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
name: Build
name: .NET

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
on:
push:
branches: [ "main" ]

pull_request:
branches: [ "main" ]

jobs:
build:

runs-on: ubuntu-latest

jobs:
build-ci:
runs-on: macos-latest
name: Mac Build
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Install .NET 6.0.300-preview.22204.3
run: |
curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --quality preview
dotnet --version
- uses: actions/setup-node@v3
with:
node-version: 16

- name: Restore Dependencies
run: dotnet restore src/Makani/Makani.csproj

- name: Build Makani
run: dotnet build src/Makani/Makani.csproj -c Release

- name: Run unit tests
run: dotnet test ./src/Makani.Tests --collect:"XPlat Code Coverage" --settings coverlet.runsettings
steps:
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore ./src/Pure.Blazor.Components

- name: Build
run: dotnet build ./src/Pure.Blazor.Components --no-restore

- name: Test
run: dotnet test ./src/Pure.Blazor.Components --no-build --verbosity normal

- name: Publish to NuGet
if: ${{ github.ref == 'refs/heads/main' }}
run: dotnet nuget push --skip-duplicate --api-key ${{secrets.PB_COMPONENTS_NUGET_KEY}} --source 'https://api.nuget.org/v3/index.json' ${{github.workspace}}/src/**/PureBlazor.Components.*.nupkg
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[![last commit](https://img.shields.io/github/last-commit/pureblazor/components?style=flat-square)](https://github.com/pureblazor/components/commits/main)
[![Discord](https://img.shields.io/discord/984241021225414787?style=flat-square)](https://discord.gg/PeBbYy6WKq)
![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/pureblazor/components/build.yml)
![GitHub last commit](https://img.shields.io/github/last-commit/pureblazor/components)
[![Discord](https://img.shields.io/discord/984241021225414787)](https://discord.gg/PeBbYy6WKq)
[![PureBlazor](https://img.shields.io/badge/pureblazor-rgb(7%2C%2072%2C%20115))](https://pureblazor.com)

# PureBlazor Components
PureBlazor Components built for the [PureBlazor CMS](https://pureblazor.com)
Expand Down
2 changes: 1 addition & 1 deletion src/Pure.Blazor.Components/Forms/PureInput.razor
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
}
else if (!string.IsNullOrWhiteSpace(errorMessage))
{
<span class="text-xs font-sans text-error py-2">@errorMessage</span>
<span class="text-xs font-sans text-red-700 py-2">@errorMessage</span>
}

</div>
Expand Down
13 changes: 7 additions & 6 deletions src/Pure.Blazor.Components/Pure.Blazor.Components.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,20 @@
<LangVersion>preview</LangVersion>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Title>PureBlazor Components</Title>
<Version>0.0.9</Version>
<Description>Blazor UI components, built with Tailwind CSS for the PureBlazor CMS</Description>
<PackageProjectUrl>https://github.com/pureblazor/components</PackageProjectUrl>
<Version>0.1.0</Version>
<PackageId>PureBlazor.Components</PackageId>
<Description>Blazor UI components for .NET Blazor with an optional headless mode.</Description>
<PackageProjectUrl>https://pureblazor.com</PackageProjectUrl>
<RepositoryUrl>https://github.com/pureblazor/components</RepositoryUrl>
<PackageTags>blazor, maui, tailwind, tailwindcss, components, pureblazor</PackageTags>
<PackageTags>blazor, maui, ssr, wasm, headless, tailwind, tailwindcss, components, pureblazor</PackageTags>
<PackageReadmeFile>README.md</PackageReadmeFile>
<IncludeSymbols>True</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageReleaseNotes>initial early release</PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Company>CodeFrog</Company>
<Company>PureBlazor</Company>
<Authors>codymullins</Authors>
<Copyright>Copyright 2023 CodeFrog</Copyright>
<Copyright>Copyright 2024 PureBlazor</Copyright>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit 144788b

Please sign in to comment.