Skip to content

Commit 461d82d

Browse files
Merge branch 'main' into hatchling
2 parents ddae43a + 4d3c548 commit 461d82d

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/pypi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
name: Packages
8989
path: dist
9090

91-
- uses: sigstore/gh-action-sigstore-python@61f6a500bbfdd9a2a339cf033e5421951fbc1cd2 # v2.1.1
91+
- uses: sigstore/gh-action-sigstore-python@04cffa1d795717b140764e8b640de88853c92acc # v3.3.0
9292
with:
9393
inputs: >-
9494
./dist/*.tar.gz

.mergify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pull_request_rules:
2222

2323
actions:
2424
merge:
25-
method: merge
25+
method: rebase
2626

2727
- name: Ping author on conflicts
2828
conditions:

0 commit comments

Comments
 (0)