Skip to content

Commit fb93175

Browse files
Kenogiordano
andauthored
Clear out artifacts destdir path if it already exists (#183)
* Clear out artifacts destdir path if it already exists Since we're doing the symlinking now, there's no reason not to just have BinaryBuilderBase manage this directory and clear it out if it already exists. This avoids having to manually clear out existing directories in `bb add`. * Update src/Prefix.jl Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com> * [CI] Increase timeout to 45 minutes Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com>
1 parent dea18f2 commit fb93175

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
jobs:
1515
test:
1616
name: Julia ${{ matrix.julia-version }} - x64 - runner ${{ matrix.runner }} - SquashFS ${{ matrix.squashfs }}
17-
timeout-minutes: 30
17+
timeout-minutes: 45
1818
runs-on: ubuntu-latest
1919
env:
2020
BINARYBUILDER_RUNNER: ${{ matrix.runner }}

src/Prefix.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ function setup_dependencies(prefix::Prefix, dependencies::Vector{PkgSpec}, platf
512512
# Copy the artifact from the global installation location into this build-specific artifacts collection
513513
src_path = Pkg.Artifacts.artifact_path(Base.SHA1(meta["git-tree-sha1"]))
514514
dest_path = joinpath(prefix, triplet(platform), "artifacts", basename(src_path))
515+
rm(dest_path; force=true, recursive=true)
515516
cp(src_path, dest_path)
516517

517518
# Keep track of our dep paths for later symlinking

0 commit comments

Comments
 (0)