Skip to content

Commit

Permalink
Rename cabal.release.project
Browse files Browse the repository at this point in the history
  • Loading branch information
philderbeast committed Apr 30, 2024
1 parent 20c83aa commit 0c195fc
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/quick-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,6 @@ jobs:
run: cabal v2-update
- uses: actions/checkout@v4
- name: Check Release with Pinned Hackage
run: cabal build all --dry-run --project-file=cabal.project.release
run: cabal build all --dry-run --project-file=cabal.release.project
- name: Check Release with Latest Hackage
run: cabal build all --dry-run --project-file=cabal.project.release --index-state="hackage.haskell.org HEAD"
run: cabal build all --dry-run --project-file=cabal.release.project --index-state="hackage.haskell.org HEAD"
8 changes: 4 additions & 4 deletions .gitlab/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@ mkdir -p "$CABAL_DIR"
#
# $PLATFORM comes from CI.
if [ "$(getconf LONG_BIT)" = "32" -o "${PLATFORM:=xxx}" = "x86_64-linux-centos7" ] ; then
echo 'constraints: lukko -ofd-locking' >> cabal.project.release.local
echo 'constraints: lukko -ofd-locking' >> cabal.release.project.local
fi

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

args=(
--disable-profiling
--enable-executable-stripping
--project-file=cabal.project.release
--project-file=cabal.release.project
${ADD_CABAL_ARGS}
)

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cabal build cabal
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:

```
cabal build --project-file=cabal.project.release cabal
cabal build --project-file=cabal.release.project cabal
```

> **Note**
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Ways to build `cabal-install` for everyday use
Git repository, move to its root, and run:

```
cabal install --project-file=cabal.project.release cabal-install
cabal install --project-file=cabal.release.project cabal-install
```

3. _Bootstrapping_:
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/generate_bootstrap_plans
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ run() {
local drv="ghc-$ver"
echo "$ver"
nix build -f "$ghcs_nix" $drv
(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)
(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)
jq --sort-keys < ../dist-bootstrap/cache/plan.json > "plan-$ver.json"
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"
}
Expand Down
File renamed without changes.
12 changes: 6 additions & 6 deletions project-cabal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
We have these projects, all in the root:

```
$ tree -P 'cabal.project*' --prune -L 1
$ tree -P '*.project' --prune -L 1
.
├── cabal.project
├── cabal.project.libonly
├── cabal.bootstrap.project
├── cabal.meta.project
├── cabal.project.release
├── cabal.validate.project
└── cabal.validate-libonly.project
├── cabal.project
├── cabal.release.project
├── cabal.validate-libonly.project
└── cabal.validate.project
```

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

0 comments on commit 0c195fc

Please sign in to comment.