Skip to content
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

update csdiff to 3.5.0 & update fedora container #452

Merged
merged 4 commits into from
Oct 2, 2024
Merged

update csdiff to 3.5.0 & update fedora container #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4079ec5
update to csdiff 3.5.0
jamacku Oct 2, 2024
158b709
deps: update fedora container
jamacku Oct 2, 2024
5b3a259
ci: disable `VALIDATE_YAML_PRETTIER`
jamacku Oct 2, 2024
4b3f129
ci: disable `VALIDATE_MARKDOWN_PRETTIER`
jamacku Oct 2, 2024
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
2 changes: 2 additions & 0 deletions .github/workflows/linter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,6 @@ jobs:
VALIDATE_CHECKOV: false
VALIDATE_JSCPD: false
VALIDATE_SHELL_SHFMT: false
VALIDATE_YAML_PRETTIER: false
VALIDATE_MARKDOWN_PRETTIER: false
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# SPDX-License-Identifier: GPL-3.0-or-later

FROM fedora@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79eb0
FROM fedora@sha256:d0207dbb078ee261852590b9a8f1ab1f8320547be79a2f39af9f3d23db33735e

# --- Version Pinning --- #

ARG fedora="40"
ARG arch="x86_64"

ARG version_csdiff="3.4.0-1"
ARG version_csdiff="3.5.0-1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that csdiff-3.5.1 is just behind the door: https://bodhi.fedoraproject.org/updates/FEDORA-2024-39c7b47798

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw it; thanks for the feedback. I'll update to 3.5.1 once it is available in stable.

ARG version_shellcheck="0.9.0-6"

ARG rpm_csdiff="csdiff-${version_csdiff}.fc${fedora}.${arch}.rpm"
Expand Down
2 changes: 2 additions & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Next release

* Update `csutils` (`csdiff`) to 3.5.0

## v5.4.0

* Native support for `merge_group` trigger event
Expand Down
4 changes: 2 additions & 2 deletions test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# SPDX-License-Identifier: GPL-3.0-or-later

FROM fedora@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79eb0
FROM fedora@sha256:d0207dbb078ee261852590b9a8f1ab1f8320547be79a2f39af9f3d23db33735e

# --- Version Pinning --- #

ARG fedora="40"
ARG arch="x86_64"

ARG version_csdiff="3.4.0-1"
ARG version_csdiff="3.5.0-1"
ARG version_shellcheck="0.9.0-6"

ARG rpm_csdiff="csdiff-${version_csdiff}.fc${fedora}.${arch}.rpm"
Expand Down
2 changes: 1 addition & 1 deletion test/show_versions.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ setup () {
assert_success
assert_output \
"ShellCheck: 0.9.0
csutils: 3.4.0"
csutils: 3.5.0"
}