Skip to content

Commit

Permalink
Revert unneeded Github Actions changes
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastiangrimberg committed Apr 7, 2023
1 parent 4a222ce commit 833e5c2
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/julia-test-with-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
make -j2
LIBCEED_LIB=$(find $PWD/lib -name "libceed.*")
pushd julia/LibCEED.jl
echo >> Project.toml
echo "[preferences.libCEED_jll]" >> Project.toml
echo "libceed_path = \"$LIBCEED_LIB\"" >> Project.toml
echo >> test/Project.toml
echo "[preferences.libCEED_jll]" >> test/Project.toml
echo "libceed_path = \"$LIBCEED_LIB\"" >> test/Project.toml
[[ "$GITHUB_REF" =~ ^refs/(heads/release|tags/).* ]] || julia --project -e 'import Pkg; Pkg.test("LibCEED"; coverage=true, test_args=["--run-dev-tests"])'
git checkout Project.toml && julia --project -e 'import Pkg; Pkg.test("LibCEED")'
git checkout test/Project.toml && julia --project -e 'import Pkg; Pkg.test("LibCEED")'
julia --project=.style/ -e 'import Pkg; Pkg.instantiate()' && julia --project=.style/ .style/ceed_style.jl && git diff --exit-code src test examples
11 changes: 11 additions & 0 deletions julia/LibCEED.jl/test/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# A bug in Julia 1.6.0's Pkg causes Preferences to be dropped during `Pkg.test()`, so we work around
# it by explicitly creating a `test/Project.toml` which will correctly communicate any preferences
# through to the child Julia process. X-ref: https://github.com/JuliaLang/Pkg.jl/issues/2500
# See also test/Project.toml in FFTW.jl.

[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
libCEED_jll = "762fde13-7596-547b-826d-8223c52d51c1"

0 comments on commit 833e5c2

Please sign in to comment.