From 814e9884427b0d5f2283b6d40c6d5534ad27644b Mon Sep 17 00:00:00 2001 From: Andrew White Date: Sun, 23 Jul 2023 14:57:17 -0600 Subject: [PATCH] chore: updating CI github workflow updates --- .github/workflows/ci.yml | 4 +-- .github/workflows/linux-6.0.yml | 23 --------------- .github/workflows/linux-7.0.yml | 23 --------------- .github/workflows/macos-6.0.yml | 22 --------------- .github/workflows/macos-7.0.yml | 22 --------------- .github/workflows/nuget-push-public.yml | 15 ---------- .github/workflows/release.yml | 28 ------------------- .github/workflows/windows-6.0.yml | 22 --------------- .github/workflows/windows-7.0.yml | 22 --------------- .../TenantInfoShould.cs | 6 ++++ 10 files changed, 8 insertions(+), 179 deletions(-) delete mode 100644 .github/workflows/linux-6.0.yml delete mode 100644 .github/workflows/linux-7.0.yml delete mode 100644 .github/workflows/macos-6.0.yml delete mode 100644 .github/workflows/macos-7.0.yml delete mode 100644 .github/workflows/nuget-push-public.yml delete mode 100644 .github/workflows/release.yml delete mode 100644 .github/workflows/windows-6.0.yml delete mode 100644 .github/workflows/windows-7.0.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03970437..372b873c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI +name: CI Workflow on: push: @@ -6,7 +6,7 @@ on: pull_request: jobs: - tests: + build-and-test: strategy: matrix: dotnet: [6.0, 7.0] diff --git a/.github/workflows/linux-6.0.yml b/.github/workflows/linux-6.0.yml deleted file mode 100644 index 35596187..00000000 --- a/.github/workflows/linux-6.0.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Linux (.NET 6.0) - -on: - push: - branches: [main] - pull_request: - -jobs: - os-tests: - runs-on: ubuntu-latest - steps: - - name: checkout repo - uses: actions/checkout@v3 - - name: test Finbuckle.MultiTenant - run: dotnet test -f net6.0 - working-directory: ./test/Finbuckle.MultiTenant.Test - - name: test Finbuckle.MultiTenant.AspNetCore - run: dotnet test -f net6.0 - working-directory: ./test/Finbuckle.MultiTenant.AspNetCore.Test - - name: test Finbuckle.MultiTenant.EntityFrameworkCore - run: dotnet test -f net6.0 - working-directory: ./test/Finbuckle.MultiTenant.EntityFrameworkCore.Test - diff --git a/.github/workflows/linux-7.0.yml b/.github/workflows/linux-7.0.yml deleted file mode 100644 index 85f84aac..00000000 --- a/.github/workflows/linux-7.0.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Linux (.NET 7.0) - -on: - push: - branches: [main] - pull_request: - -jobs: - os-tests: - runs-on: ubuntu-latest - steps: - - name: checkout repo - uses: actions/checkout@v3 - - name: test Finbuckle.MultiTenant - run: dotnet test -f net7.0 - working-directory: ./test/Finbuckle.MultiTenant.Test - - name: test Finbuckle.MultiTenant.AspNetCore - run: dotnet test -f net7.0 - working-directory: ./test/Finbuckle.MultiTenant.AspNetCore.Test - - name: test Finbuckle.MultiTenant.EntityFrameworkCore - run: dotnet test -f net7.0 - working-directory: ./test/Finbuckle.MultiTenant.EntityFrameworkCore.Test - diff --git a/.github/workflows/macos-6.0.yml b/.github/workflows/macos-6.0.yml deleted file mode 100644 index 476d09c1..00000000 --- a/.github/workflows/macos-6.0.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: MacOS (.NET 6.0) - -on: - push: - branches: [main] - pull_request: - -jobs: - os-tests: - runs-on: macos-latest - steps: - - name: checkout repo - uses: actions/checkout@v3 - - name: test Finbuckle.MultiTenant - run: dotnet test -f net6.0 - working-directory: ./test/Finbuckle.MultiTenant.Test - - name: test Finbuckle.MultiTenant.AspNetCore - run: dotnet test -f net6.0 - working-directory: ./test/Finbuckle.MultiTenant.AspNetCore.Test - - name: test Finbuckle.MultiTenant.EntityFrameworkCore - run: dotnet test -f net6.0 - working-directory: ./test/Finbuckle.MultiTenant.EntityFrameworkCore.Test diff --git a/.github/workflows/macos-7.0.yml b/.github/workflows/macos-7.0.yml deleted file mode 100644 index 15a32258..00000000 --- a/.github/workflows/macos-7.0.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: MacOS (.NET 7.0) - -on: - push: - branches: [main] - pull_request: - -jobs: - os-tests: - runs-on: macos-latest - steps: - - name: checkout repo - uses: actions/checkout@v3 - - name: test Finbuckle.MultiTenant - run: dotnet test -f net7.0 - working-directory: ./test/Finbuckle.MultiTenant.Test - - name: test Finbuckle.MultiTenant.AspNetCore - run: dotnet test -f net7.0 - working-directory: ./test/Finbuckle.MultiTenant.AspNetCore.Test - - name: test Finbuckle.MultiTenant.EntityFrameworkCore - run: dotnet test -f net7.0 - working-directory: ./test/Finbuckle.MultiTenant.EntityFrameworkCore.Test diff --git a/.github/workflows/nuget-push-public.yml b/.github/workflows/nuget-push-public.yml deleted file mode 100644 index 72c99f84..00000000 --- a/.github/workflows/nuget-push-public.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: NuGet Push Public - -on: [workflow_dispatch] - -jobs: - build-test-prep-deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Create the package - run: dotnet test -c Release && dotnet pack --no-build -c Release --output nupkgs - - name: Publish the package to NuGet.org - env: - NUGET_KEY: ${{secrets.NUGET_KEY}} - run: dotnet nuget push nupkgs/*.nupkg -k $NUGET_KEY -s https://api.nuget.org/v3/index.json --skip-duplicate diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index cab7c9c5..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Release - -on: [workflow_dispatch] - -jobs: - build-test-prep-release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: build and test - run: | - dotnet restore - dotnet build -c Release --no-restore - dotnet test -c Release --no-build - - name: setup semantic-release - run: | - npm install -D semantic-release - npm install -D @semantic-release/git - npm install -D @semantic-release/changelog - npm install -D @semantic-release/exec - npm install -D conventional-changelog-conventionalcommits - - name: run semantic-release - env: - GH_TOKEN: ${{ secrets.GH_TOKEN }} - run: npx semantic-release diff --git a/.github/workflows/windows-6.0.yml b/.github/workflows/windows-6.0.yml deleted file mode 100644 index b6b147f0..00000000 --- a/.github/workflows/windows-6.0.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Windows (.NET 6.0) - -on: - push: - branches: [main] - pull_request: - -jobs: - os-tests: - runs-on: windows-latest - steps: - - name: checkout repo - uses: actions/checkout@v3 - - name: test Finbuckle.MultiTenant - run: dotnet test -f net6.0 - working-directory: ./test/Finbuckle.MultiTenant.Test - - name: test Finbuckle.MultiTenant.AspNetCore - run: dotnet test -f net6.0 - working-directory: ./test/Finbuckle.MultiTenant.AspNetCore.Test - - name: test Finbuckle.MultiTenant.EntityFrameworkCore - run: dotnet test -f net6.0 - working-directory: ./test/Finbuckle.MultiTenant.EntityFrameworkCore.Test diff --git a/.github/workflows/windows-7.0.yml b/.github/workflows/windows-7.0.yml deleted file mode 100644 index 48ce0b08..00000000 --- a/.github/workflows/windows-7.0.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Windows (.NET 7.0) - -on: - push: - branches: [main] - pull_request: - -jobs: - os-tests: - runs-on: windows-latest - steps: - - name: checkout repo - uses: actions/checkout@v3 - - name: test Finbuckle.MultiTenant - run: dotnet test -f net7.0 - working-directory: ./test/Finbuckle.MultiTenant.Test - - name: test Finbuckle.MultiTenant.AspNetCore - run: dotnet test -f net7.0 - working-directory: ./test/Finbuckle.MultiTenant.AspNetCore.Test - - name: test Finbuckle.MultiTenant.EntityFrameworkCore - run: dotnet test -f net7.0 - working-directory: ./test/Finbuckle.MultiTenant.EntityFrameworkCore.Test diff --git a/test/Finbuckle.MultiTenant.Test/TenantInfoShould.cs b/test/Finbuckle.MultiTenant.Test/TenantInfoShould.cs index 7a302bb2..6524004b 100644 --- a/test/Finbuckle.MultiTenant.Test/TenantInfoShould.cs +++ b/test/Finbuckle.MultiTenant.Test/TenantInfoShould.cs @@ -8,6 +8,12 @@ namespace Finbuckle.MultiTenant.Test { public class TenantInfoShould { + [Fact] + public void AlwaysFail() + { + Assert.True(false); + } + [Fact] public void ThrowIfIdSetWithLengthAboveTenantIdMaxLength() {