Skip to content

Commit 833e5c2

Browse files
Revert unneeded Github Actions changes
1 parent 4a222ce commit 833e5c2

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

.github/workflows/julia-test-with-style.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
make -j2
3434
LIBCEED_LIB=$(find $PWD/lib -name "libceed.*")
3535
pushd julia/LibCEED.jl
36-
echo >> Project.toml
37-
echo "[preferences.libCEED_jll]" >> Project.toml
38-
echo "libceed_path = \"$LIBCEED_LIB\"" >> Project.toml
36+
echo >> test/Project.toml
37+
echo "[preferences.libCEED_jll]" >> test/Project.toml
38+
echo "libceed_path = \"$LIBCEED_LIB\"" >> test/Project.toml
3939
[[ "$GITHUB_REF" =~ ^refs/(heads/release|tags/).* ]] || julia --project -e 'import Pkg; Pkg.test("LibCEED"; coverage=true, test_args=["--run-dev-tests"])'
40-
git checkout Project.toml && julia --project -e 'import Pkg; Pkg.test("LibCEED")'
40+
git checkout test/Project.toml && julia --project -e 'import Pkg; Pkg.test("LibCEED")'
4141
julia --project=.style/ -e 'import Pkg; Pkg.instantiate()' && julia --project=.style/ .style/ceed_style.jl && git diff --exit-code src test examples

julia/LibCEED.jl/test/Project.toml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# A bug in Julia 1.6.0's Pkg causes Preferences to be dropped during `Pkg.test()`, so we work around
2+
# it by explicitly creating a `test/Project.toml` which will correctly communicate any preferences
3+
# through to the child Julia process. X-ref: https://github.com/JuliaLang/Pkg.jl/issues/2500
4+
# See also test/Project.toml in FFTW.jl.
5+
6+
[deps]
7+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
8+
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
9+
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
10+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
11+
libCEED_jll = "762fde13-7596-547b-826d-8223c52d51c1"

0 commit comments

Comments
 (0)