From a119b5d95e4e2c05fd949e5208950b23dbda6627 Mon Sep 17 00:00:00 2001 From: "phnx47[bot]" <78849906+phnx47-bot@users.noreply.github.com> Date: Wed, 1 Nov 2023 23:01:13 +0700 Subject: [PATCH] chore: synced file(s) with prom-client-net/prom-tmpl (#102) --- .github/renovate.json | 3 --- .github/workflows/automerge.yml | 25 +++++++++++++++++++++++++ .github/workflows/ci.yml | 3 ++- 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/automerge.yml diff --git a/.github/renovate.json b/.github/renovate.json index cc5ba24..0babd11 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -12,9 +12,6 @@ "assignees": [ "@phnx47" ], - "ignoreDeps": [ - "System.Text.Encodings.Web" - ], "packageRules": [ { "automerge": true, diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 0000000..420f833 --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,25 @@ +name: Auto-merge + +on: + pull_request: + types: [labeled] + branches: + - "main" + +permissions: + pull-requests: write + contents: write + +jobs: + automerge: + name: Enable auto-merge + runs-on: ubuntu-22.04 + if: github.actor == 'phnx47-bot' && contains(github.event.pull_request.labels.*.name, 'sync') + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Run command + run: gh pr merge -s --auto ${{ github.event.pull_request.number }} + env: + GH_TOKEN: ${{ secrets.GH_FULL_PAT }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cbb7630..e9b9982 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,8 @@ jobs: with: name: nupkgs - name: Push to pkg.github.com - run: dotnet nuget push "**/*.nupkg" -s https://nuget.pkg.github.com/prom-client-net/index.json -k ${{ secrets.GH_FULL_PAT }} --skip-duplicate + run: dotnet nuget push "**/*.nupkg" -s https://nuget.pkg.github.com/prom-client-net/index.json -k ${{ secrets.GH_FULL_PAT }} + nuget: name: Deploy to NuGet needs: [build]