diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml deleted file mode 100644 index c7a8d45..0000000 --- a/.github/workflows/dotnet-core.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: .NET Core - -on: - push: - branches: - - master - - develop - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: ubuntu-latest - env: - working-directory: ./src - steps: - - uses: actions/checkout@v2 - - name: Setup .NET Core - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 7.0.x - - name: Install dependencies - working-directory: ${{env.working-directory}} - run: dotnet restore - - name: Build - working-directory: ${{env.working-directory}} - run: dotnet build --configuration Release --no-restore - - name: Test - working-directory: ${{env.working-directory}} - run: dotnet test --no-restore --verbosity normal diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 99e6569..75bc96f 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,14 +2,17 @@ name: .NET on: push: - branches: [ "master" ] + branches: + - master + - develop pull_request: branches: [ "master" ] jobs: build: - runs-on: ubuntu-latest + env: + working-directory: ./src steps: - uses: actions/checkout@v4 @@ -20,7 +23,13 @@ jobs: dotnet-version: 8.0.x - name: Restore dependencies - run: dotnet restore src/System.CommandLine.Extensions.sln + working-directory: ${{env.working-directory}} + run: dotnet restore System.CommandLine.Extensions.sln - name: Build - run: dotnet build src/System.CommandLine.Extensions.sln --no-restore + working-directory: ${{env.working-directory}} + run: dotnet build System.CommandLine.Extensions.sln --no-restore + + - name: Test + working-directory: ${{env.working-directory}} + run: dotnet test System.CommandLine.Extensions.sln --no-restore --verbosity normal \ No newline at end of file diff --git a/.gitignore b/.gitignore index d05c57a..7f96ab5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .vs/ .idea/ -.github/ bin/ obj/ diff --git a/README.md b/README.md index 188f296..f7ebcc9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![.NET Core](https://github.com/matzefriedrich/command-line-api-extensions/workflows/.NET%20Core/badge.svg) +![.NET 8](https://github.com/matzefriedrich/command-line-api-extensions/workflows/dotnet.yml/badge.svg) # System.CommandLine.Extensions