Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions base/comps/components-publish-channels.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2358,6 +2358,7 @@ components = [
"shared-mime-info",
"sharutils",
"shell-color-prompt",
"ShellCheck",
"shim",
"shim-unsigned-aarch64",
"shim-unsigned-x64",
Expand Down Expand Up @@ -2995,4 +2996,13 @@ packages = [
"rust-zram-generator-devel", # srpm: rust-zram-generator
# cargo-rpm-macros: build-time RPM macros for packaging cargo crates; not needed at base runtime, used by SDK packagers.
"cargo-rpm-macros", # srpm: cargo-rpm-macros
# ShellCheck's Haskell library subpackages: only the statically-linked `shellcheck`
# executable is wanted in base. The ghc-ShellCheck library links the ghc runtime
# libraries (libHS*), and ghc-ShellCheck-devel hard-Requires ghc-compiler; both the
# ghc compiler and the ghc-* runtime libraries live in sdk. Keep these siblings in
# sdk so base carries only the executable (which needs only libc/libm/libffi/libgmp).
"ghc-ShellCheck", # srpm: ShellCheck
"ghc-ShellCheck-devel", # srpm: ShellCheck
"ghc-ShellCheck-doc", # srpm: ShellCheck
"ghc-ShellCheck-prof", # srpm: ShellCheck
]
1 change: 1 addition & 0 deletions base/comps/components.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ overlay-files = ["overlays/*.overlay.toml"]
[components.SDL3_ttf]
[components.SDL_gfx]
[components.SFCGAL]
[components.ShellCheck]

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

issue(blocking): I discussed a bit more with the other maintainers. Given the relatively (small) number of components touched in this PR, we'd like you to split this PR in two:

  1. Add: ghc-Diff + ghc-fgl; we expect scratch PR builds should pass on this, as they already have in this PR.
  2. Add ShellCheck; once PR (1) is merged we can see the PR scratch build checks pass on this. I'd also recommend including the base repo routing entry for ShellCheck in this PR.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

That sounds good, will split the PR.

[components.SuperLU]
[components.SuperLUMT]
[components.Thunar]
Expand Down
6 changes: 6 additions & 0 deletions locks/ShellCheck.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Managed by azldev component update. Do not edit manually.
version = 1
import-commit = '8d23c9a1acc822d3fe7623d20258bb2da9736342'
upstream-commit = '8d23c9a1acc822d3fe7623d20258bb2da9736342'
input-fingerprint = 'sha256:b1593888ca12e6813e350f57fcf54fd6b4b0ce7845bf1073f8c3e32673b7aa68'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
Loading
Loading