From 3bc0813bc893913eab6e53f39185fad3bad3ce76 Mon Sep 17 00:00:00 2001 From: Toby Jennings Date: Thu, 5 Dec 2024 10:07:38 -0600 Subject: [PATCH] Update CI --- .github/workflows/ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5fc022a..2879d67 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,8 +12,6 @@ env: "on": merge_group: {} pull_request: - branches: - - main push: branches-ignore: # These should always correspond to pull requests, so ignore them for @@ -94,10 +92,12 @@ jobs: needs: [lint, test] timeout-minutes: 10 if: >- - github.event.pull_request.merged == true + github.event.pull_request.closed_at != 0 + && github.event.pull_request.merged == true steps: - - run: | - echo "${{ github.head_ref }} merged into ${{ github.ref }}" + - run: >- + echo "${{ github.head_ref }} merged into ${{ github.ref }} + by {{ github.event.pull_request.merged_by.name }} <{{ github.event.pull_request.merged_by.email }}>" - uses: actions/checkout@v4 - name: Set up UV