Skip to content

Commit

Permalink
Trim CI config
Browse files Browse the repository at this point in the history
With the old configuration, we would run CI twice when pushing a commit and
opening a pull request. Or when pushing a commit that belongs to a pull request.

With the new configuration, we run CI once when opening a PR, and once when
pushing a commit that belongs to a pull request. And once when merging to
master (the `push` event). Importantly, this configuration still works for
contributions from forked repositories, since the `pull_request` events are
triggered on _our_ fork.

Also adding the .git-blame-ignore-revs file matching the recent "style change
commits".
  • Loading branch information
bquorning committed Nov 8, 2023
1 parent fa5717a commit e17bd18
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
0f442b1777212eb5f0574f1d66d8692d7b42c94d
9f9fbc7e8e711fd3c3f1377c415dffba14d08d48
fa5717a68557d679b76f8a485466bd3192c06ad7
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: CI

on: [pull_request, push, workflow_dispatch]
on:
pull_request:
push:
branches:
- master
workflow_dispatch:

jobs:
specs:
Expand Down Expand Up @@ -29,7 +34,7 @@ jobs:
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
LEGACY_CONNECTION_HANDLING: ${{ matrix.legacy_connection_handling }}
steps:
- uses: zendesk/checkout@v2
- uses: zendesk/checkout@v4
- name: Set up Ruby
uses: zendesk/setup-ruby@v1
with:
Expand Down

0 comments on commit e17bd18

Please sign in to comment.