8000 Use relative paths for workflows by maxkadel · Pull Request #3577 · projectblacklight/blacklight · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Use relative paths for workflows #3577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 22, 2025
Merged

Use relative paths for workflows #3577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
001d237
Use relative paths for actions
maxkadel Apr 22, 2025
3a391f2
Get linting green on main branch
maxkadel Apr 22, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ on:
pull_request:
jobs:
lint:
uses: projectblacklight/blacklight/.github/workflows/lint.yml@weekly_ci_run
uses: ./.github/workflows/lint.yml
test:
uses: projectblacklight/blacklight/.github/workflows/test.yml@weekly_ci_run
uses: ./.github/workflows/test.yml
with:
ruby: '["3.4"]'
docker_build:
uses: projectblacklight/blacklight/.github/workflows/build.yml@weekly_ci_run
uses: ./.github/workflows/build.yml
7 changes: 3 additions & 4 deletions .github/workflows/release_8_x_scheduled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@ on:
- cron: '35 9 * * 5'
jobs:
lint:
uses: projectblacklight/blacklight/.github/workflows/lint.yml@weekly_ci_run
uses: ./.github/workflows/lint.yml
with:
ref: release-8.x
test:
uses: projectblacklight/blacklight/.github/workflows/test.yml@weekly_ci_run
uses: ./.github/workflows/lint.yml
with:
ref: release-8.x
ruby: '["3.3"]'
docker_build:
uses: projectblacklight/blacklight/.github/workflows/build.yml@weekly_ci_run
uses: ./.github/workflows/lint.yml
with:
ref: release-8.x
report:
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/concerns/blacklight/search_context.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def page_links
@page_link_data[:prev] = page_links_document_path(documents.first, index)
@page_link_data[:next] = page_links_document_path(documents.last, index + 2)
end
if response&.total && response.total.positive?
if response&.total&.positive?
@page_link_data[:counterRaw] = counter_param
@page_link_data[:counterDelimited] = helpers.number_with_delimiter(counter_param.to_i)
@page_link_data[:totalRaw] = response.total
Expand Down
2 changes: 2 additions & 0 deletions lib/blacklight/configuration/field.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def validate!
raise ArgumentError, "Must supply a field name" if self.field.nil?
end

# rubocop:disable Style/RedundantParentheses
def display_label(context = nil, **)
field_label(
(:"blacklight.search.fields.#{context}.#{key}" if context),
Expand All @@ -42,6 +43,7 @@ def display_label(context = nil, **)
**
)
end
# rubocop:enable Style/RedundantParentheses

def default_label
if self.key.respond_to?(:titleize)
Expand Down
0