Skip to content

Commit 0c195fc

Browse files
committed
Rename cabal.release.project
1 parent 20c83aa commit 0c195fc

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

.github/workflows/quick-jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,6 @@ jobs:
137137
run: cabal v2-update
138138
- uses: actions/checkout@v4
139139
- name: Check Release with Pinned Hackage
140-
run: cabal build all --dry-run --project-file=cabal.project.release
140+
run: cabal build all --dry-run --project-file=cabal.release.project
141141
- name: Check Release with Latest Hackage
142-
run: cabal build all --dry-run --project-file=cabal.project.release --index-state="hackage.haskell.org HEAD"
142+
run: cabal build all --dry-run --project-file=cabal.release.project --index-state="hackage.haskell.org HEAD"

.gitlab/ci.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,29 @@ mkdir -p "$CABAL_DIR"
3131
#
3232
# $PLATFORM comes from CI.
3333
if [ "$(getconf LONG_BIT)" = "32" -o "${PLATFORM:=xxx}" = "x86_64-linux-centos7" ] ; then
34-
echo 'constraints: lukko -ofd-locking' >> cabal.project.release.local
34+
echo 'constraints: lukko -ofd-locking' >> cabal.release.project.local
3535
fi
3636

3737
# In February 2024, cabal started using zlib-0.7.0.0, which uses pkg-config by
3838
# default. The GitLab CI environment doesn't (yet) supply pkg-config, and zlib
3939
# does just fine without it on modern GHCs. That said, the CI environment
4040
# probably *should* have pkg-config installed. See
4141
# https://github.com/haskell/cabal/issues/9774.
42-
echo 'constraints: zlib -pkg-config' >> cabal.project.release.local
42+
echo 'constraints: zlib -pkg-config' >> cabal.release.project.local
4343
# Furthermore, on Windows, zlib claims that libz is shipped with GHC, so it just
4444
# uses @extra-libraries: z@ if pkg-config is False. If you are reading this
4545
# comment, however, this didn't work. Thus we switch to using the bundled libz,
4646
# as was done in zlib <0.7.0.0.
4747
case "$(uname)" in
4848
MSYS_*|MINGW*)
49-
echo 'constraints: zlib +bundled-c-zlib' >> cabal.project.release.local
49+
echo 'constraints: zlib +bundled-c-zlib' >> cabal.release.project.local
5050
;;
5151
esac
5252

5353
args=(
5454
--disable-profiling
5555
--enable-executable-stripping
56-
--project-file=cabal.project.release
56+
--project-file=cabal.release.project
5757
${ADD_CABAL_ARGS}
5858
)
5959

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cabal build cabal
1212
If not, you aren't able to build the testsuite, so you need to disable the default `cabal.project` that implies configuring the testsuite, e.g., with:
1313

1414
```
15-
cabal build --project-file=cabal.project.release cabal
15+
cabal build --project-file=cabal.release.project cabal
1616
```
1717

1818
> **Note**

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Ways to build `cabal-install` for everyday use
8484
Git repository, move to its root, and run:
8585
8686
```
87-
cabal install --project-file=cabal.project.release cabal-install
87+
cabal install --project-file=cabal.release.project cabal-install
8888
```
8989
9090
3. _Bootstrapping_:

bootstrap/generate_bootstrap_plans

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ run() {
1010
local drv="ghc-$ver"
1111
echo "$ver"
1212
nix build -f "$ghcs_nix" $drv
13-
(cd ../; rm -r dist-bootstrap; cabal --distdir=dist-bootstrap build --project-file=cabal.project.release --dry-run cabal-install:exe:cabal -w bootstrap/result/bin/ghc)
13+
(cd ../; rm -r dist-bootstrap; cabal --distdir=dist-bootstrap build --project-file=cabal.release.project --dry-run cabal-install:exe:cabal -w bootstrap/result/bin/ghc)
1414
jq --sort-keys < ../dist-bootstrap/cache/plan.json > "plan-$ver.json"
1515
cabal run --with-ghc-pkg $PWD/boot_ghc/bin/ghc-pkg -w $PWD/boot_ghc/bin/ghc -v0 cabal-bootstrap-gen -- "plan-$ver.json" | jq --sort-keys | tee "linux-$(echo $ver | tr "_" ".").json"
1616
}
File renamed without changes.

project-cabal/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
We have these projects, all in the root:
44

55
```
6-
$ tree -P 'cabal.project*' --prune -L 1
6+
$ tree -P '*.project' --prune -L 1
77
.
8-
├── cabal.project
9-
├── cabal.project.libonly
8+
├── cabal.bootstrap.project
109
├── cabal.meta.project
11-
├── cabal.project.release
12-
├── cabal.validate.project
13-
└── cabal.validate-libonly.project
10+
├── cabal.project
11+
├── cabal.release.project
12+
├── cabal.validate-libonly.project
13+
└── cabal.validate.project
1414
```
1515

1616
Projects are expected to pass a `build --dry-run` standalone test,

0 commit comments

Comments
 (0)