Skip to content

Commit 4bb6a67

Browse files
authored
Merge pull request #862 from varvet/kbs/fix-build-pipeline
Release v2.5.1 Closes #861
2 parents a457343 + 6ceca0d commit 4bb6a67

File tree

8 files changed

+45
-21
lines changed

8 files changed

+45
-21
lines changed

.github/workflows/main.yml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ permissions:
1010
contents: read
1111

1212
env:
13-
CC_TEST_REPORTER_ID: "ac477089fe20ab4fc7e0d304cab75f72d73d58a7596d366935d18fcc7d51f8f9"
14-
1513
# `github.ref` points to the *merge commit* when running tests on a pull request, which will be a commit
1614
# that doesn't exists in our code base. Since this workflow triggers from a PR, we use the HEAD SHA instead.
1715
#
18-
# NOTE: These are both used by Code Climate (cc-test-reporter).
16+
# NOTE: These both used to be used by Code Climate (cc-test-reporter), superseded by qlty.sh
1917
GIT_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
2018
GIT_BRANCH: ${{ github.head_ref }}
2119

@@ -61,12 +59,6 @@ jobs:
6159
rubygems: latest
6260
ruby-version: "ruby"
6361
bundler-cache: true
64-
- name: "Download cc-test-reporter from codeclimate.com"
65-
run: |
66-
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
67-
chmod +x ./cc-test-reporter
68-
- name: "Report to Code Climate that we will send a coverage report."
69-
run: ./cc-test-reporter before-build
7062
- name: Run tests
7163
run: bundle exec rspec
7264
env:
@@ -78,11 +70,25 @@ jobs:
7870
name: coverage-results
7971
path: coverage
8072
retention-days: 1
81-
- name: Upload code coverage to Code Climate
82-
run: |
83-
./cc-test-reporter after-build \
84-
--coverage-input-type simplecov \
85-
./coverage/.resultset.json
73+
74+
coverage-upload:
75+
permissions:
76+
id-token: write # Required for OIDC
77+
needs: test
78+
runs-on: ubuntu-latest
79+
steps:
80+
- uses: actions/checkout@v4
81+
- name: Download coverage results
82+
uses: actions/download-artifact@v4
83+
with:
84+
name: coverage-results
85+
path: coverage
86+
- name: Upload code coverage to qlty.sh
87+
uses: qltysh/qlty-action/coverage@v2
88+
with:
89+
oidc: true
90+
format: simplecov
91+
files: coverage/.resultset.json
8692

8793
coverage-check:
8894
permissions:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ spec/reports
1616
test/tmp
1717
test/version_tmp
1818
tmp
19-
bin

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
## Unreleased
44

5+
## 2.5.1 (2025-09-12)
6+
57
### Fixed
6-
- Requiring only `pundit/rspec` can raise an error in Active Support (#857)
8+
- Requiring only `pundit/rspec` no longer raises an error in Active Support [#857](https://github.com/varvet/pundit/issues/857)
79

810
## 2.5.0 (2025-03-03)
911

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Pundit
22

33
[![Main](https://github.com/varvet/pundit/actions/workflows/main.yml/badge.svg)](https://github.com/varvet/pundit/actions/workflows/main.yml)
4-
[![Code Climate](https://api.codeclimate.com/v1/badges/a940030f96c9fb43046a/maintainability)](https://codeclimate.com/github/varvet/pundit/maintainability)
4+
[![Maintainability](https://qlty.sh/gh/varvet/projects/pundit/maintainability.svg)](https://qlty.sh/gh/varvet/projects/pundit)
55
[![Inline docs](https://inch-ci.org/github/varvet/pundit.svg?branch=main)](https://inch-ci.org/github/varvet/pundit)
66
[![Gem Version](https://badge.fury.io/rb/pundit.svg)](https://badge.fury.io/rb/pundit)
77

bin/console

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env ruby
2+
# frozen_string_literal: true
3+
4+
require "bundler/setup"
5+
require "pundit"
6+
7+
# You can add fixtures and/or initialization code here to make experimenting
8+
# with your gem easier. You can also use a different console, if you like.
9+
10+
require "irb"
11+
IRB.start(__FILE__)

bin/setup

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
IFS=$'\n\t'
4+
set -vx
5+
6+
bundle install
7+
8+
# Do any other automated setup that you need to do here

lib/pundit/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
module Pundit
44
# The current version of Pundit.
5-
VERSION = "2.5.0"
5+
VERSION = "2.5.1"
66
end

pundit.gemspec

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# frozen_string_literal: true
22

3-
lib = File.expand_path("lib", __dir__)
4-
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
5-
require "pundit/version"
3+
require_relative "lib/pundit/version"
64

75
Gem::Specification.new do |gem|
86
gem.name = "pundit"

0 commit comments

Comments
 (0)