Skip to content

Sync master with upstream Nike-Inc/hal master - #5

Open
Tristano8 wants to merge 37 commits into
masterfrom
sync-with-upstream
Open

Tristano8 wants to merge 37 commits into
masterfrom
sync-with-upstream

Conversation

@Tristano8

Copy link
Copy Markdown

Brings fork master up to date with Nike-Inc/hal master (633afb5), so that master contains all upstream merged work plus the changes from the still-open Nike-Inc#140 (SQS message attribute decoding and the MessageAttribute sum type, already on master via #3).

Includes upstream merges of Nike-Inc#139 and Nike-Inc#144 plus maintenance work: CI updates, hedgehog bounds relaxation and removal of the use-aeson-2.2 flag (Nike-Inc#138, Nike-Inc#141), new stack LTS files, and the version-publishing fix (Nike-Inc#135).

Conflict resolution:

After this merges, the haskell monorepo pin will be updated to the new master head.

IamfromSpace and others added 30 commits December 18, 2023 20:12
Moved from v2, now hard dropped, to v4.
…he-version

Bump Github Action action/cache version
Since we didn't consider the cabal file in our cache key, just the GHC version,
we could get incorrect cache collisions.
…ache-key

Fix cache key error for Github Action Cabal builds
…ispatch

Add workflow_dispatch trigger to allow manually running CI on any branch
In pin stack LTS snapshots, so that we are always testing the most recent
snapshot for each LTS.  This ensures we remain compatible (and that should
always be true anyway).
Add Nix to CI with currently supported versions and unstable checked.
…shots

Intentionally let stack LTS snapshots float
…n-for-easier-merging

Modify the hpack generated version number, to eliminate conflicts wit…
NOTE: `attoparsec-aeson` has a shim `2.1.0.0` release that depends on
old versions of `aeson`, ensuring that `Data.Aeson.Parser` is always
available.
Support newer releases of `hedgehog` and drop aeson migration flag
…rsions-to-ci

Maint/add additional versions to ci
…er-versions

Publish on versions with just two numbers.
IamfromSpace and others added 7 commits October 28, 2026 15:56
…ions-of-cabal

Update older versions of cabal that no longer work.  Some dependencies also need older Ubuntu, and we also disable fail-fast builds, since there's a lot less correlation between failures than it might seem.
…-for-nix-builds

Disable fail fast for nix builds.
…-for-stack-builds

Disable fail fast for stack builds.
Syncs the fork with upstream master (633afb5): the upstream merges of Nike-Inc#139 and Nike-Inc#144 plus maintenance work (CI, nix, stack snapshots, hedgehog bounds, and removal of the use-aeson-2.2 flag in Nike-Inc#141).

Conflict resolution:
- CHANGELOG.md: combined entries from both sides.
- src/AWS/Lambda/Events/SQS.hs: kept the fork version, which already contains upstream's changes plus the messageAttributes sum type (upstreamed as Nike-Inc#140, still open).
@Tristano8 Tristano8 mentioned this pull request Oct 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants