From 73f2dec555057bca5497f5961b48585c5f0a19df Mon Sep 17 00:00:00 2001
From: Teo Camarasu <teofilcamarasu@gmail.com>
Date: Sat, 28 Oct 2023 21:36:55 +0100
Subject: [PATCH] Fix build-repo job for xdg supporting cabal-install
cabal-install might put files either into .cabal or .cache/cabal depending on whether the .cabal dir exists. let's just try both directories for maximum compatiblity
---
ci/build-repo.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/ci/build-repo.sh b/ci/build-repo.sh
index 080ff66c..a741b701 100755
--- a/ci/build-repo.sh
+++ b/ci/build-repo.sh
@@ -173,7 +173,14 @@ build_repo() {
cabal update
cabal fetch acme-box-0.0.0.0
mkdir -p repo/package
- cp $HOME/.cabal/packages/hackage.haskell.org/acme-box/0.0.0.0/acme-box-0.0.0.0.tar.gz repo/package
+
+ # if ~/.cabal exists cabal-install will use that, otherwise packages go into $XDG_CACHE_HOME/cabal
+ if [ -d "$HOME/.cabal" ]; then
+ cp "$HOME/.cabal/packages/hackage.haskell.org/acme-box/0.0.0.0/acme-box-0.0.0.0.tar.gz" repo/package
+ else
+ cp "${XDG_CACHE_HOME:-$HOME/.cache}/cabal/packages/hackage.haskell.org/acme-box/0.0.0.0/acme-box-0.0.0.0.tar.gz" repo/package
+ fi
+
log "Bootstrapping repository..."
hackage-repo-tool bootstrap --keys=./keys --repo=./repo
--
GitLab