Skip to content

Commit 8b1e2f9

Browse files
authored
Fix CI for Julia+Asserts. (#295)
1 parent 2aa1b2f commit 8b1e2f9

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,11 @@ jobs:
5959
${{ runner.os }}-test-
6060
${{ runner.os }}-
6161
- uses: julia-actions/julia-buildpkg@v1
62-
env:
63-
# precompiling the package loads LLVMExtra, which we cannot do with LLVM+Asserts
64-
# because we first need to build a local LLVMExtra.
65-
JULIA_PKG_PRECOMPILE: false
6662
- name: Build libLLVMExtra
6763
if: ${{ matrix.libLLVMExtra == 'local' }}
6864
run: |
6965
julia --project=deps -e 'using Pkg; Pkg.instantiate()'
7066
julia --project=deps deps/build_local.jl
71-
julia --project -e 'using Pkg; Pkg.precompile()'
7267
# test
7368
- name: Run tests
7469
run: |

deps/build_local.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,7 @@ set_preferences!(
4949
"libLLVMExtra_path" => lib_path;
5050
force=true,
5151
)
52+
53+
# Copy the preferences to `test/` as well to work around Pkg.jl#2500
54+
cp(joinpath(dirname(@__DIR__), "LocalPreferences.toml"),
55+
joinpath(dirname(@__DIR__), "test", "LocalPreferences.toml"))

test/runtests.jl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
# HACK: work around Pkg.jl#2500
2-
test_project = Base.active_project()
3-
preferences_file = joinpath(dirname(@__DIR__), "LocalPreferences.toml")
4-
test_preferences_file = joinpath(dirname(test_project), "LocalPreferences.toml")
5-
if isfile(preferences_file) && !isfile(test_preferences_file)
6-
cp(preferences_file, test_preferences_file)
7-
end
8-
91
using LLVM
102
using LLVMExtra_jll
113
using Test

0 commit comments

Comments
 (0)