Skip to content

Commit 65a53df

Browse files
GrantBirkiGrantBirki
authored
Merge pull request #21 from github/updates
General Updates
2 parents 6a5dc8c + b727ce4 commit 65a53df

Some content is hidden

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

62 files changed

+249
-108
lines changed

‎.github/dependabot.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
version: 2
3+
updates:
4+
- package-ecosystem: bundler
5+
vendor: true
6+
directory: "/"
7+
schedule:
8+
interval: weekly
9+
day: "monday"
10+
time: "21:00"
11+
groups:
12+
prod-ruby-dependencies:
13+
dependency-type: "production"
14+
patterns:
15+
- "*"
16+
dev-ruby-dependencies:
17+
dependency-type: "development"
18+
patterns:
19+
- "*"
20+
- package-ecosystem: github-actions
21+
directory: "/"
22+
groups:
23+
github-actions:
24+
patterns:
25+
- "*"
26+
schedule:
27+
interval: weekly
28+
day: "tuesday"
29+
time: "21:00"

‎.github/workflows/acceptance.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
has_change: ${{ steps.diff.outputs.has_change}}
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121

2222
- id: fetch-base
2323
if: github.event_name == 'pull_request'
@@ -50,10 +50,10 @@ jobs:
5050
if: github.event_name == 'push'
5151
run: echo "::set-output name=has_change::true"
5252

53-
acceptance-suite:
53+
acceptance:
5454
needs: changes
55-
runs-on: ubuntu-latest
56-
name: runner / acceptance-tests
55+
runs-on: ubuntu-latest-xl
56+
name: acceptance
5757
permissions:
5858
contents: read
5959

@@ -67,7 +67,7 @@ jobs:
6767
6868
- name: checkout
6969
if: ${{ needs.changes.outputs.has_change == 'true' }}
70-
uses: actions/checkout@v3
70+
uses: actions/checkout@v4
7171

7272
# Use Docker layer caching for 'docker build' and 'docker-compose build' commands.
7373
# https://github.com/satackey/action-docker-layer-caching/releases/tag/v0.0.11

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,17 @@ permissions:
1515
jobs:
1616
build:
1717
name: build
18-
runs-on: ubuntu-latest
18+
19+
strategy:
20+
matrix:
21+
os: [ubuntu-latest, macos-latest]
22+
runs-on: ${{ matrix.os }}
1923

2024
steps:
2125
- name: checkout
22-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2327

24-
- uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # pin@v1.152.0
28+
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # pin@v1.173.0
2529
with:
2630
bundler-cache: true
2731

‎.github/workflows/gem.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818

1919
steps:
2020
- name: checkout
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222

23-
- uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # pin@v1.152.0
23+
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # pin@v1.173.0
2424
with:
2525
bundler-cache: true
2626

@@ -31,7 +31,7 @@ jobs:
3131
run: bundle exec rubocop -c .rubocop.yml lib/ spec/
3232

3333
- name: test
34-
run: script/test
34+
run: script/test -d -k
3535

3636
- name: set GEM_NAME from gemspec
3737
run: echo "GEM_NAME=$(ls | grep gemspec | cut -d. -f1)" >> $GITHUB_ENV
@@ -46,7 +46,7 @@ jobs:
4646
GEM_HOST_API_KEY=${{ secrets.GITHUB_TOKEN }} gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} ${{ env.GEM_NAME }}-${{ env.GEM_VERSION }}.gem
4747
4848
- name: release
49-
uses: ncipollo/release-action@a2e71bdd4e7dab70ca26a852f29600c98b33153e # pin@v1.12.0
49+
uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # pin@v1.14.0
5050
with:
5151
artifacts: "${{ env.GEM_NAME }}-${{ env.GEM_VERSION }}.gem"
5252
tag: "v${{ env.GEM_VERSION }}"

‎.github/workflows/lint.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,24 @@ on:
66
- main
77
pull_request:
88

9+
permissions:
10+
contents: read
11+
912
jobs:
10-
rubocop:
11-
name: runner / rubocop
13+
lint:
14+
name: lint
1215
runs-on: ubuntu-latest
13-
permissions:
14-
contents: read
1516

1617
steps:
1718
- name: checkout
18-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
1920

20-
- uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # pin@v1.152.0
21+
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # pin@v1.173.0
2122
with:
2223
bundler-cache: true
2324

25+
- name: bootstrap
26+
run: script/bootstrap
27+
2428
- name: rubocop
2529
run: bundle exec rubocop -c .rubocop.yml lib/ spec/

‎.github/workflows/test.yml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,29 @@ on:
66
- main
77
pull_request:
88

9+
permissions:
10+
contents: read
11+
912
jobs:
10-
rubocop:
11-
name: runner / rspec
13+
test:
14+
name: test
1215
runs-on: ubuntu-latest
13-
permissions:
14-
contents: read
16+
17+
strategy:
18+
matrix:
19+
ruby: [ '3.1.2', '3.1.4', '3.2.2', '3.2.3', '3.3.0' ]
1520

1621
steps:
1722
- name: checkout
18-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
1924

20-
- uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # pin@v1.152.0
25+
- uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899 # pin@v1.173.0
2126
with:
2227
bundler-cache: true
28+
ruby-version: ${{ matrix.ruby }}
29+
30+
- name: bootstrap
31+
run: script/bootstrap
2332

2433
- name: rspec tests
25-
run: script/test -d
34+
run: script/test -d -k

‎.rubocop.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ inherit_gem:
33
- config/default.yml
44

55
AllCops:
6+
NewCops: disable
67
SuggestExtensions: false
78
DisplayCopNames: true
8-
TargetRubyVersion: 3.1
9+
TargetRubyVersion: 3.3
910
Exclude:
1011
- 'bin/*'
1112
- 'spec/acceptance/fixtures/**/*'

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.2
1+
3.3.0

‎Gemfile.lock‎

Lines changed: 52 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,70 @@
11
PATH
22
remote: .
33
specs:
4-
entitlements-gitrepo-auditor-plugin (0.4.0)
4+
entitlements-gitrepo-auditor-plugin (0.4.1)
55
contracts (~> 0.17)
66
entitlements-app (~> 0.3)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
activesupport (7.0.7.2)
11+
activesupport (7.1.3.2)
12+
base64
13+
bigdecimal
1214
concurrent-ruby (~> 1.0, >= 1.0.2)
15+
connection_pool (>= 2.2.5)
16+
drb
1317
i18n (>= 1.6, < 2)
1418
minitest (>= 5.1)
19+
mutex_m
1520
tzinfo (~> 2.0)
1621
addressable (2.8.5)
1722
public_suffix (>= 2.0.2, < 6.0)
1823
ast (2.4.2)
1924
base64 (0.1.1)
25+
bigdecimal (3.1.7)
2026
concurrent-ruby (1.1.9)
27+
connection_pool (2.4.1)
2128
contracts (0.17)
2229
crack (0.4.5)
2330
rexml
2431
diff-lcs (1.5.0)
2532
docile (1.4.0)
26-
entitlements-app (0.3.0)
33+
drb (2.2.1)
34+
entitlements-app (0.3.1)
2735
concurrent-ruby (= 1.1.9)
2836
faraday (~> 2.0)
2937
net-ldap (~> 0.17)
3038
octokit (~> 4.18)
3139
optimist (= 3.0.0)
32-
faraday (2.7.11)
33-
base64
34-
faraday-net_http (>= 2.0, < 3.1)
35-
ruby2_keywords (>= 0.0.4)
36-
faraday-net_http (3.0.2)
40+
faraday (2.9.0)
41+
faraday-net_http (>= 2.0, < 3.2)
42+
faraday-net_http (3.1.0)
43+
net-http
3744
hashdiff (1.0.1)
38-
i18n (1.14.1)
45+
i18n (1.14.4)
3946
concurrent-ruby (~> 1.0)
4047
json (2.6.3)
41-
minitest (5.19.0)
42-
net-ldap (0.18.0)
48+
language_server-protocol (3.17.0.3)
49+
minitest (5.22.3)
50+
mutex_m (0.2.0)
51+
net-http (0.4.1)
52+
uri
53+
net-ldap (0.19.0)
4354
octokit (4.25.1)
4455
faraday (>= 1, < 3)
4556
sawyer (~> 0.9)
4657
optimist (3.0.0)
47-
parallel (1.23.0)
48-
parser (3.2.2.3)
58+
parallel (1.24.0)
59+
parser (3.3.0.5)
4960
ast (~> 2.4.1)
5061
racc
5162
public_suffix (5.0.3)
52-
racc (1.7.1)
53-
rack (3.0.8)
63+
racc (1.7.3)
64+
rack (3.0.10)
5465
rainbow (3.1.1)
5566
rake (13.0.6)
56-
regexp_parser (2.8.1)
67+
regexp_parser (2.9.0)
5768
rexml (3.2.6)
5869
rspec (3.8.0)
5970
rspec-core (~> 3.8.0)
@@ -68,31 +79,33 @@ GEM
6879
diff-lcs (>= 1.2.0, < 2.0)
6980
rspec-support (~> 3.8.0)
7081
rspec-support (3.8.3)
71-
rubocop (1.29.1)
82+
rubocop (1.62.1)
83+
json (~> 2.3)
84+
language_server-protocol (>= 3.17.0)
7285
parallel (~> 1.10)
73-
parser (>= 3.1.0.0)
86+
parser (>= 3.3.0.2)
7487
rainbow (>= 2.2.2, < 4.0)
7588
regexp_parser (>= 1.8, < 3.0)
7689
rexml (>= 3.2.5, < 4.0)
77-
rubocop-ast (>= 1.17.0, < 2.0)
90+
rubocop-ast (>= 1.31.1, < 2.0)
7891
ruby-progressbar (~> 1.7)
79-
unicode-display_width (>= 1.4.0, < 3.0)
80-
rubocop-ast (1.29.0)
81-
parser (>= 3.2.1.0)
82-
rubocop-github (0.17.0)
83-
rubocop
84-
rubocop-performance
85-
rubocop-rails
86-
rubocop-performance (1.13.3)
87-
rubocop (>= 1.7.0, < 2.0)
88-
rubocop-ast (>= 0.4.0)
89-
rubocop-rails (2.15.2)
92+
unicode-display_width (>= 2.4.0, < 3.0)
93+
rubocop-ast (1.31.2)
94+
parser (>= 3.3.0.4)
95+
rubocop-github (0.20.0)
96+
rubocop (>= 1.37)
97+
rubocop-performance (>= 1.15)
98+
rubocop-rails (>= 2.17)
99+
rubocop-performance (1.20.2)
100+
rubocop (>= 1.48.1, < 2.0)
101+
rubocop-ast (>= 1.30.0, < 2.0)
102+
rubocop-rails (2.24.1)
90103
activesupport (>= 4.2.0)
91104
rack (>= 1.1)
92-
rubocop (>= 1.7.0, < 2.0)
105+
rubocop (>= 1.33.0, < 2.0)
106+
rubocop-ast (>= 1.31.1, < 2.0)
93107
ruby-progressbar (1.13.0)
94-
ruby2_keywords (0.0.5)
95-
rugged (0.27.5)
108+
rugged (1.7.2)
96109
sawyer (0.9.2)
97110
addressable (>= 2.3.5)
98111
faraday (>= 0.17.3, < 3)
@@ -105,7 +118,8 @@ GEM
105118
simplecov-html (0.10.2)
106119
tzinfo (2.0.6)
107120
concurrent-ruby (~> 1.0)
108-
unicode-display_width (2.4.2)
121+
unicode-display_width (2.5.0)
122+
uri (0.13.0)
109123
vcr (4.0.0)
110124
webmock (3.4.2)
111125
addressable (>= 2.3.6)
@@ -120,10 +134,10 @@ DEPENDENCIES
120134
rake (= 13.0.6)
121135
rspec (= 3.8.0)
122136
rspec-core (= 3.8.0)
123-
rubocop (= 1.29.1)
124-
rubocop-github (= 0.17.0)
125-
rubocop-performance (= 1.13.3)
126-
rugged (= 0.27.5)
137+
rubocop (= 1.62.1)
138+
rubocop-github (= 0.20.0)
139+
rubocop-performance (= 1.20.2)
140+
rugged (~> 1.7, >= 1.7.2)
127141
simplecov (= 0.16.1)
128142
simplecov-erb (= 1.0.1)
129143
vcr (= 4.0.0)

‎entitlements-gitrepo-auditor-plugin.gemspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ Gem::Specification.new do |s|
2020
s.add_development_dependency "rake", "= 13.0.6"
2121
s.add_development_dependency "rspec", "= 3.8.0"
2222
s.add_development_dependency "rspec-core", "= 3.8.0"
23-
s.add_development_dependency "rubocop", "= 1.29.1"
24-
s.add_development_dependency "rubocop-github", "= 0.17.0"
25-
s.add_development_dependency "rubocop-performance", "= 1.13.3"
26-
s.add_development_dependency "rugged", "= 0.27.5"
23+
s.add_development_dependency "rubocop", "= 1.62.1"
24+
s.add_development_dependency "rubocop-github", "= 0.20.0"
25+
s.add_development_dependency "rubocop-performance", "= 1.20.2"
26+
s.add_development_dependency "rugged", "~> 1.7", ">= 1.7.2"
2727
s.add_development_dependency "simplecov", "= 0.16.1"
2828
s.add_development_dependency "simplecov-erb", "= 1.0.1"
2929
s.add_development_dependency "vcr", "= 4.0.0"

0 commit comments

Comments
 (0)