From 783102ec7929f413744bc13bb23094dedf268698 Mon Sep 17 00:00:00 2001 From: ysicing Date: Mon, 23 Dec 2024 09:06:47 +0800 Subject: [PATCH] * [ci] fix security --- .github/dependabot.yml | 6 +++++- .github/workflows/merge.yml | 17 +++++++++++++++++ docs/swagger.json | 2 +- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/merge.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2fccaad..9af0934 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,8 +3,12 @@ updates: - package-ecosystem: gomod directory: / schedule: - interval: daily + interval: weekly + open-pull-requests-limit: 1 + rebase-strategy: disabled - package-ecosystem: github-actions directory: / schedule: interval: daily + open-pull-requests-limit: 1 + rebase-strategy: disabled diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml new file mode 100644 index 0000000..45182f6 --- /dev/null +++ b/.github/workflows/merge.yml @@ -0,0 +1,17 @@ +name: BotAutoMerge + +on: pull_request + +permissions: + pull-requests: write + contents: write + +jobs: + automerge: + runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' + steps: + - uses: peter-evans/enable-pull-request-automerge@v3 + with: + pull-request-number: ${{ github.event.pull_request.number }} + merge-method: rebase diff --git a/docs/swagger.json b/docs/swagger.json index 477802b..0b9f087 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -547,4 +547,4 @@ } } } -} +} \ No newline at end of file diff --git a/go.mod b/go.mod index ed23ff3..ecb8bab 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( golang.org/x/crypto v0.31.0 // indirect golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/net v0.32.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect diff --git a/go.sum b/go.sum index 6f5c3cc..8b5d0fa 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,8 @@ golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e h1:4qufH0hlUYs6AO6XmZC3GqfDP golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= -golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= -golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=