Skip to content

Commit 481f999

Browse files
authored
Merge pull request #602 from zendesk/bquorning/standardrb
RuboCop → StandardRb
2 parents 60b64ca + d5d84ce commit 481f999

File tree

129 files changed

+1210
-1877
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+1210
-1877
lines changed

.git-blame-ignore-revs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# .git-blame-ignore-revs
2+
3+
# What is this file?
4+
5+
# 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.
6+
# Using --ignore-rev, or this file, one can specify a commit to be ignored by git blame.
7+
# Lines changed by the ignored commit will be attributed to the previous commit touching that line instead.
8+
# This means that even after our bulk style change, we can get back a meaningful context for the 'real' changes to our code.
9+
10+
# How do I use it?
11+
12+
# The file should contain the full (40 character) commit hashes.
13+
# Lines starting with a # are considered comments and can be used to explain what makes the given commit(s) unimportant.
14+
# Commit order in the file is not important.
15+
16+
# Lint: Fix Style/StringLiterals etc. offenses
17+
afbf222941a6afbc9ac0a4db49534fa15436ae69
18+
19+
# Lint: Fix layout offenses
20+
3db45d38aa28dbbd7830658254ec9c59c02a29e0
21+
22+
# Lint: Fix simple offenses
23+
0221a908fec6d2a55ce645c5a17a074c93957be3
24+
25+
# Move require of spec_helper into .rspec
26+
8f09a851fb6feae50769ffb5430b3f0ebe3053b4

.github/workflows/main.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99
- spec_live
1010

1111
jobs:
12-
test-and-lint:
13-
name: Test and lint
12+
test:
13+
name: Test
1414
runs-on: ubuntu-latest
1515
strategy:
1616
fail-fast: false
@@ -30,10 +30,9 @@ jobs:
3030
with:
3131
bundler-cache: true
3232
ruby-version: ${{ matrix.ruby }}
33-
- name: Test and Lint
34-
run: |
35-
bundle exec rake
36-
bundle exec rubocop
33+
- name: Test
34+
run: bundle exec rake
35+
3736
spec-live:
3837
name: Spec live
3938
if: github.repository == 'zendesk/zendesk_api_client_rb'
@@ -54,3 +53,16 @@ jobs:
5453
bundle exec rake clean_live set_ci_credentials spec:live ||
5554
bundle exec rake clean_live &&
5655
bundle exec rspec spec/live --only-failures
56+
57+
lint:
58+
name: Lint
59+
runs-on: ubuntu-latest
60+
steps:
61+
- name: Checkout code
62+
uses: actions/checkout@v5
63+
- name: Set up Ruby
64+
uses: ruby/setup-ruby@v1
65+
with:
66+
bundler-cache: true
67+
- name: Lint
68+
run: bundle exec rake standard

.rspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
--color
22
--order random
3+
--require core/spec_helper

.rubocop.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)