gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

maintainers/haskell/merge-and-open-pr.sh: target staging

Browse Source 
We can't update the package list after the merge since it may be weeks
until the changes propagate to master and the channels.
This commit is contained in:
sternenseemann
2025-02-11 21:48:03 +01:00
parent d38e3dc423
commit b3d74de2a1
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maintainers/scripts/haskell/merge-and-open-pr.sh
View File

@@ -1,8 +1,8 @@
#! /usr/bin/env nix-shell #! /usr/bin/env nix-shell
#! nix-shell -i bash -p git gh -I nixpkgs=. #! nix-shell -i bash -p git gh -I nixpkgs=.
# #
# Script to merge the currently open haskell-updates PR into master, bump the # Script to merge the currently open haskell-updates PR , bump the Stackage
# Stackage version and Hackage versions, and open the next haskell-updates PR. # version and Hackage versions, and open the next haskell-updates PR.
set -eu -o pipefail set -eu -o pipefail
@@ -79,10 +79,6 @@ fi
echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_num}..." echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_num}..."
gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num" gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num"
# Update the list of Haskell package versions in NixOS on Hackage.
echo "Updating list of Haskell package versions in NixOS on Hackage..."
./maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh
# Update stackage, Hackage hashes, and regenerate Haskell package set # Update stackage, Hackage hashes, and regenerate Haskell package set
echo "Updating Stackage..." echo "Updating Stackage..."
./maintainers/scripts/haskell/update-stackage.sh --do-commit ./maintainers/scripts/haskell/update-stackage.sh --do-commit
@@ -100,7 +96,7 @@ git push "$push_remote" haskell-updates
new_pr_body=$(cat <<EOF new_pr_body=$(cat <<EOF
### This Merge ### This Merge
This PR is the regular merge of the \`haskell-updates\` branch into \`master\`. This PR is the regular merge of the \`haskell-updates\` branch into \`staging\`.
This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. You may be able to find an up-to-date Hydra build report at [cdepillabout/nix-haskell-updates-status](https://github.com/cdepillabout/nix-haskell-updates-status). This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. You may be able to find an up-to-date Hydra build report at [cdepillabout/nix-haskell-updates-status](https://github.com/cdepillabout/nix-haskell-updates-status).
@@ -113,7 +109,7 @@ Our workflow is currently described in [\`pkgs/development/haskell-modules/HACKI
The short version is this: The short version is this:
* We regularly update the Stackage and Hackage pins on \`haskell-updates\` (normally at the beginning of a merge window). * We regularly update the Stackage and Hackage pins on \`haskell-updates\` (normally at the beginning of a merge window).
* The community fixes builds of Haskell packages on that branch. * The community fixes builds of Haskell packages on that branch.
* We aim at at least one merge of \`haskell-updates\` into \`master\` every two weeks. * We aim at at least one merge of \`haskell-updates\` into \`staging\` every two weeks.
* We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra. * We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra.
* If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!) * If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)
@@ -126,4 +122,4 @@ EOF
) )
echo "Opening a PR for the next haskell-updates merge cycle..." echo "Opening a PR for the next haskell-updates merge cycle..."
gh pr create --repo NixOS/nixpkgs --base master --head haskell-updates --title "haskellPackages: update stackage and hackage" --body "$new_pr_body" gh pr create --repo NixOS/nixpkgs --base staging --head haskell-updates --title "haskellPackages: update stackage and hackage" --body "$new_pr_body"