From f7dc0e8bced9c097030a85dcb3a619bca01989d5 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Sat, 28 Dec 2024 21:54:47 -0800 Subject: [PATCH 1/2] add mergify support Problem: Mergifyio is a nice bot to auto rebase and merge PRs that are approved and have passed all tests. Add initial mergify support. Initial reviewers that can approve pull requests are on team @chaos/diod. PRs must be tagged with the merge-when-passing label. --- .mergify.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 00000000..3461807d --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,26 @@ +queue_rules: + - name: default + queue_conditions: + - base=master + - label="merge-when-passing" + - label!="work-in-progress" + - -title~=^\[*[Ww][Ii][Pp] + - "approved-reviews-by=@chaos/diod-admins" + - "#approved-reviews-by>0" + - "#changes-requested-reviews-by=0" + merge_conditions: + - base=master + - label="merge-when-passing" + - label!="work-in-progress" + - "approved-reviews-by=@chaos/diod-admins" + - "#approved-reviews-by>0" + - "#changes-requested-reviews-by=0" + - -title~=^\[*[Ww][Ii][Pp] + update_method: rebase + merge_method: merge + +pull_request_rules: + - name: rebase and merge when passing all checks + conditions: [] + actions: + queue: From 76fd64eb4f6cdd2bc303c7e930cda7a31fc7b4d2 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Sat, 28 Dec 2024 12:33:20 -0800 Subject: [PATCH 2/2] ci: drop deprecated 18.04 actions runner Problem: the ubuntu 18.04 runner was deprecated in 2023. Drop this runner from the test matrix. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aea3bd37..cedf8b8a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: cc: [gcc, clang] - os: [ubuntu-latest, ubuntu-18.04] + os: [ubuntu-latest] steps: - uses: actions/checkout@v2