lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

We can't update the package list after the merge since it may be weeks
until the changes propagate to master and the channels.

+5 -9
+5 -9
maintainers/scripts/haskell/merge-and-open-pr.sh
··· 1 1 #! /usr/bin/env nix-shell 2 2 #! nix-shell -i bash -p git gh -I nixpkgs=. 3 3 # 4 - # Script to merge the currently open haskell-updates PR into master, bump the 5 - # Stackage version and Hackage versions, and open the next haskell-updates PR. 4 + # Script to merge the currently open haskell-updates PR , bump the Stackage 5 + # version and Hackage versions, and open the next haskell-updates PR. 6 6 7 7 set -eu -o pipefail 8 8 ··· 79 79 echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_num}..." 80 80 gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num" 81 81 82 - # Update the list of Haskell package versions in NixOS on Hackage. 83 - echo "Updating list of Haskell package versions in NixOS on Hackage..." 84 - ./maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh 85 - 86 82 # Update stackage, Hackage hashes, and regenerate Haskell package set 87 83 echo "Updating Stackage..." 88 84 ./maintainers/scripts/haskell/update-stackage.sh --do-commit ··· 100 96 new_pr_body=$(cat <<EOF 101 97 ### This Merge 102 98 103 - This PR is the regular merge of the \`haskell-updates\` branch into \`master\`. 99 + This PR is the regular merge of the \`haskell-updates\` branch into \`staging\`. 104 100 105 101 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). 106 102 ··· 113 109 The short version is this: 114 110 * We regularly update the Stackage and Hackage pins on \`haskell-updates\` (normally at the beginning of a merge window). 115 111 * The community fixes builds of Haskell packages on that branch. 116 - * We aim at at least one merge of \`haskell-updates\` into \`master\` every two weeks. 112 + * We aim at at least one merge of \`haskell-updates\` into \`staging\` every two weeks. 117 113 * We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra. 118 114 * 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!) 119 115 ··· 126 122 ) 127 123 128 124 echo "Opening a PR for the next haskell-updates merge cycle..." 129 - gh pr create --repo NixOS/nixpkgs --base master --head haskell-updates --title "haskellPackages: update stackage and hackage" --body "$new_pr_body" 125 + gh pr create --repo NixOS/nixpkgs --base staging --head haskell-updates --title "haskellPackages: update stackage and hackage" --body "$new_pr_body"