diff --git a/.github/mergify.yml b/.github/mergify.yml index 37b6d50a0..72f91e244 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -23,22 +23,20 @@ shared: queue_rules: - name: default - conditions: + queue_conditions: - and: *compulsory - -pull_request_rules: - - name: Automatic merge - conditions: + - label=ready-to-merge + merge_conditions: - and: *compulsory - # Ensure the review is opted in using labels. - - label=ready-to-merge + merge_method: merge + commit_message_template: | + {{ title }} (#{{ number }}) + {{ body }} + +pull_request_rules: + - name: refactored queue action rule + conditions: [] actions: queue: - name: default - method: merge - commit_message_template: | - {{ title }} (#{{ number }}) - - {{ body }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 041c5c244..dc2ccda56 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: run: make e2e-test - name: Upload codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/go.mod b/go.mod index 139a51472..96d989d6d 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( google.golang.org/protobuf v1.35.2 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.31.2 - k8s.io/apimachinery v0.31.2 + k8s.io/apimachinery v0.31.3 k8s.io/client-go v0.31.2 knative.dev/pkg v0.0.0-20241021150727-76cfa123adf1 sigs.k8s.io/controller-runtime v0.19.0 diff --git a/go.sum b/go.sum index a386784ee..cee62d90c 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= -k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw= -k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4= +k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc= k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=