From fa9ef1bfe1418b101bb9175e42f7a7f4ee39ebdc Mon Sep 17 00:00:00 2001 From: Ilia Baryshnikov Date: Wed, 18 Mar 2026 14:55:05 +0300 Subject: [PATCH] Fix typo and use a relative URL Rerun tests to get normalised output Co-authored-by: Phil de Joux --- .github/pull_request_template.md | 14 +++++++------- CONTRIBUTING.md | 2 +- .../cabal.ignore-project.v2.out | 2 +- .../Projects-Default-No/cabal.no-project.v2.out | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e6576b7d92d..b605110c9b6 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,16 +1,16 @@ -Please read [Github PR Conventions](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#github-pull-request-conventions) and then fill in *one* of these two templates. +Please read [Github PR Conventions](CONTRIBUTING.md#github-pull-request-conventions) and then fill in *one* of these two templates. --- -**Template Α: This PR modifies [behaviour or interface](https://github.com/cabalism/cabal/blob/master/CONTRIBUTING.md#changelog)** +**Template Α: This PR modifies [behaviour or interface](CONTRIBUTING.md#changelog)** Include the following checklist in your PR: -* [ ] Patches conform to the [coding conventions](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#other-conventions). -* [ ] Any changes that could be relevant to users [have been recorded in the changelog](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#changelog). - * [ ] [Is the change significant?](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#is-my-change-significant) If so, remember to add `significance: significant` in the changelog file. +* [ ] Patches conform to the [coding conventions](CONTRIBUTING.md#other-conventions). +* [ ] Any changes that could be relevant to users [have been recorded in the changelog](CONTRIBUTING.md#changelog). + * [ ] [Is the change significant?](CONTRIBUTING.md#is-my-change-significant) If so, remember to add `significance: significant` in the changelog file. * [ ] The documentation has been updated, if necessary. -* [ ] [Manual QA notes](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#qa-notes) have been included. +* [ ] [Manual QA notes](CONTRIBUTING.md#qa-notes) have been included. * [ ] Tests have been added. (*Ask for help if you don’t know how to write them! Ask for an exemption if tests are too complex for too little coverage!*) --- @@ -21,5 +21,5 @@ Include the following checklist in your PR: Include the following checklist in your PR: -* [ ] Patches conform to the [coding conventions](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#other-conventions). +* [ ] Patches conform to the [coding conventions](CONTRIBUTING.md#other-conventions). * [ ] Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef7dcf51228..408106fc711 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -407,7 +407,7 @@ gh pr create --template pull_request_template.md ``` This way you will not erase the -[PR template](https://github.com/haskell/cabal/blob/master/.github/pull_request_template.md) +[PR template](.github/pull_request_template.md) all contributors use. ## Changelog diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.v2.out b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.v2.out index e6f04ba9970..67bd3824161 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.v2.out +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.v2.out @@ -1,2 +1,2 @@ # cabal v2-sdist -Wrote tarball sdist to /home/philderbeast/dev/src/cabalism/cabal/cabal-testsuite/PackageTests/SDist/Respect-Project-File/dist-newstyle/sdist/p-0.1.tar.gz +Wrote tarball sdist to /dist-newstyle/sdist/uv-0.1.tar.gz diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.v2.out b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.v2.out index e6f04ba9970..67bd3824161 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.v2.out +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.v2.out @@ -1,2 +1,2 @@ # cabal v2-sdist -Wrote tarball sdist to /home/philderbeast/dev/src/cabalism/cabal/cabal-testsuite/PackageTests/SDist/Respect-Project-File/dist-newstyle/sdist/p-0.1.tar.gz +Wrote tarball sdist to /dist-newstyle/sdist/uv-0.1.tar.gz