Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# .git-blame-ignore-revs

# What is this file?

# To limit the impact of 'unimportant' bulk commits, like big a PR full of rubocop fixes, git 2.23 adds a new option to git blame.
# Using --ignore-rev, or this file, one can specify a commit to be ignored by git blame.
# Lines changed by the ignored commit will be attributed to the previous commit touching that line instead.
# This means that even after our bulk style change, we can get back a meaningful context for the 'real' changes to our code.

# How do I use it?

# The file should contain the full (40 character) commit hashes.
# Lines starting with a # are considered comments and can be used to explain what makes the given commit(s) unimportant.
# Commit order in the file is not important.

# Lint: Fix Style/StringLiterals etc. offenses
afbf222941a6afbc9ac0a4db49534fa15436ae69

# Lint: Fix layout offenses
3db45d38aa28dbbd7830658254ec9c59c02a29e0

# Lint: Fix simple offenses
0221a908fec6d2a55ce645c5a17a074c93957be3

# Move require of spec_helper into .rspec
8f09a851fb6feae50769ffb5430b3f0ebe3053b4
24 changes: 18 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ on:
- spec_live

jobs:
test-and-lint:
name: Test and lint
test:
name: Test
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -30,10 +30,9 @@ jobs:
with:
bundler-cache: true
ruby-version: ${{ matrix.ruby }}
- name: Test and Lint
run: |
bundle exec rake
bundle exec rubocop
- name: Test
run: bundle exec rake

spec-live:
name: Spec live
if: github.repository == 'zendesk/zendesk_api_client_rb'
Expand All @@ -54,3 +53,16 @@ jobs:
bundle exec rake clean_live set_ci_credentials spec:live ||
bundle exec rake clean_live &&
bundle exec rspec spec/live --only-failures

lint:
name: Lint
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v5
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- name: Lint
run: bundle exec rake standard
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
--color
--order random
--require core/spec_helper
58 changes: 0 additions & 58 deletions .rubocop.yml

This file was deleted.

Loading