From 58231e971b9e18cbc9334a965ff357b40126f9c2 Mon Sep 17 00:00:00 2001 From: "phnx47[bot]" <78849906+phnx47-bot@users.noreply.github.com> Date: Tue, 10 Dec 2024 16:31:00 +0000 Subject: [PATCH] sync: synced file(s) with prom-client-net/prom-client-tmpl --- .github/settings.yml | 2 +- .github/workflows/{ci.yml => ci-linux.yml} | 20 +++++--------------- .github/workflows/ci-windows.yml | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 16 deletions(-) rename .github/workflows/{ci.yml => ci-linux.yml} (82%) create mode 100644 .github/workflows/ci-windows.yml diff --git a/.github/settings.yml b/.github/settings.yml index ef4f972..1966249 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -61,7 +61,7 @@ branches: required_pull_request_reviews: null required_status_checks: strict: false - contexts: ['Build & Test (Windows)', 'Build, Test & Pack (Linux)'] + contexts: ['Build, Test & Pack (Linux)'] enforce_admins: false required_linear_history: false restrictions: null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci-linux.yml similarity index 82% rename from .github/workflows/ci.yml rename to .github/workflows/ci-linux.yml index 85ead12..06561c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci-linux.yml @@ -1,4 +1,4 @@ -name: CI +name: CI Linux on: push: @@ -12,16 +12,6 @@ on: workflow_dispatch: jobs: - build-windows: - name: Build & Test (Windows) - runs-on: windows-2022 - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Run tests - run: dotnet test -c Release --filter FullyQualifiedName\!~Tests.Integration -p:CollectCoverage=false - build-linux: name: Build, Test & Pack (Linux) runs-on: ubuntu-24.04 @@ -42,7 +32,7 @@ jobs: run: dotnet build -c Release -p:ContinuousIntegrationBuild=true - name: Run tests - run: dotnet test --no-build -c Release --filter FullyQualifiedName\!~Tests.Integration -p:CollectCoverage=true -e:CoverletOutputFormat=opencover + run: dotnet test --no-build -c Release -p:CollectCoverage=true -e:CoverletOutputFormat=opencover - name: Publish to Codecov uses: codecov/codecov-action@v5 @@ -76,7 +66,7 @@ jobs: github: name: Deploy to GitHub - needs: [build-windows, build-linux] + needs: [build-linux] if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') runs-on: ubuntu-24.04 steps: @@ -85,11 +75,11 @@ jobs: with: name: nupkgs - name: Push to pkg.github.com - run: dotnet nuget push "**/*.nupkg" -s https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json -k ${{ secrets.GH_FULL_PAT }} + run: dotnet nuget push "**/*.nupkg" -s https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json -k ${{ secrets.GH_FULL_PAT }} --skip-duplicate nuget: name: Deploy to NuGet - needs: [build-windows, build-linux] + needs: [build-linux] if: startsWith(github.ref, 'refs/tags/v') runs-on: ubuntu-24.04 steps: diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml new file mode 100644 index 0000000..6a7686d --- /dev/null +++ b/.github/workflows/ci-windows.yml @@ -0,0 +1,21 @@ +name: CI Windows + +on: + push: + branches: + - "main" + pull_request: + branches: + - "main" + workflow_dispatch: + +jobs: + build-windows: + name: Build & Test (Windows) + runs-on: windows-2022 + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Run tests + run: dotnet test -c Release -p:CollectCoverage=false