Commit be540e85 authored by Ben Gamari's avatar Ben Gamari 🐢

Fix recursive copy to patches/

parent d0559653
Pipeline #11661 failed with stages
in 18 minutes and 52 seconds
...@@ -136,7 +136,8 @@ update-repo: ...@@ -136,7 +136,8 @@ update-repo:
- nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs - nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs
- nix-channel --update - nix-channel --update
- nix build -f ci/default.nix - nix build -f ci/default.nix
- nix run -f ci/default.nix -c build-repo.sh extract-build-repo - nix run -f ci/default.nix -c build-repo.sh extract-keys
- nix run -f ci/default.nix -c build-repo.sh build-repo
- nix run -f '<nixpkgs>' gnutar -c tar -zxf logs.tar.gz - nix run -f '<nixpkgs>' gnutar -c tar -zxf logs.tar.gz
- mv logs repo - mv logs repo
- cp summary.dot.svg repo - cp summary.dot.svg repo
......
...@@ -164,12 +164,13 @@ build_repo() { ...@@ -164,12 +164,13 @@ build_repo() {
mkdir -p repo/package 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 cp $HOME/.cabal/packages/hackage.haskell.org/acme-box/0.0.0.0/acme-box-0.0.0.0.tar.gz repo/package
cp -R $PATCHES patches mkdir -p tmp
cp -R $PATCHES tmp/patches
hackage-repo-tool bootstrap --keys=./keys --repo=./repo hackage-repo-tool bootstrap --keys=./keys --repo=./repo
mkdir -p template patches.cache mkdir -p template patches.cache
tool \ tool \
--patches=./patches \ --patches=./tmp/patches \
--repo-cache=./cache \ --repo-cache=./cache \
--keys=./keys \ --keys=./keys \
--repo-name=head.hackage \ --repo-name=head.hackage \
...@@ -178,15 +179,13 @@ build_repo() { ...@@ -178,15 +179,13 @@ build_repo() {
build_constraints > repo/cabal.constraints build_constraints > repo/cabal.constraints
build_index build_index
rm -R tmp
} }
case $1 in case $1 in
gen-keys) gen_keys_tarball ;; gen-keys) gen_keys_tarball ;;
extract-keys) extract_keys_tarball ;; extract-keys) extract_keys_tarball ;;
build-repo) build_repo ;; build-repo) build_repo ;;
extract-build-repo)
extract_keys_tarball
build_repo ;;
build-constraints) build_constraints ;; build-constraints) build_constraints ;;
build-repository-blurb) build_repository_blurb ;; build-repository-blurb) build_repository_blurb ;;
build-index) build-index)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment