Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
YongAn404 committed Oct 7, 2024
2 parents 3d27c9c + d927248 commit 762a24f
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 5 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/dotnet.yml → .github/workflows/dev.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# This workflow will build a .NET project
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net

name: .NET
name: YongAnFrame Dev CI

on:
push:
branches: [ "master" ]
branches:
- dev
pull_request:
branches: [ "master" ]

branches:
- dev
workflow_dispatch:
jobs:
build:
runs-on: windows-latest
Expand All @@ -32,4 +34,3 @@ jobs:

- name: Test
run: dotnet test --no-build --verbosity normal

37 changes: 37 additions & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This workflow will build a .NET project
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net

name: YongAnFrame Master CI

on:
push:
branches:
- master
pull_request:
branches:
- master
workflow_dispatch:
jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v4

- name: Setup NuGet
uses: NuGet/setup-nuget@v2.0.0

- name: Restore NuGet packages
run: nuget restore YongAnFrame.sln

- name: Restore dependencies
run: dotnet restore

- name: Build
run: dotnet build --no-restore

- name: Test
run: dotnet test --no-build --verbosity normal

0 comments on commit 762a24f

Please sign in to comment.