Skip to content

Commit 9b18ee3

Browse files
committed
Update default manifest
1 parent 833d988 commit 9b18ee3

2 files changed

Lines changed: 30 additions & 9 deletions

File tree

Manifest-v1.12.toml.default

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.12.5"
44
manifest_format = "2.0"
5-
project_hash = "81e304e780542cfdc4180283768c9e11a894789b"
5+
project_hash = "4547f3bab4d36036426023f5fd785deb6743d4b1"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "f7304359109c768cf32dc5fa2d371565bb63b68a"
@@ -1283,9 +1283,9 @@ version = "0.11.4"
12831283

12841284
[[deps.KiteViewers]]
12851285
deps = ["FileIO", "GLMakie", "GeometryBasics", "Joysticks", "KiteUtils", "LinearAlgebra", "Parameters", "Pkg", "PrecompileTools", "Printf", "Reexport", "Rotations", "StaticArrays", "StructArrays", "Timers"]
1286-
git-tree-sha1 = "819d96b8e7ee1d967383598a18b76b33db65235d"
1286+
git-tree-sha1 = "cae633ece41d23e572fd5bce01440cee7912d45a"
12871287
uuid = "2e593061-95e7-45e4-95f4-df0491f2e601"
1288-
version = "0.5.1"
1288+
version = "0.5.2"
12891289

12901290
[[deps.Krylov]]
12911291
deps = ["LinearAlgebra", "Printf", "SparseArrays"]

bin/update_default_manifest

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ julia_major=$(julia --startup-file=no -e 'print("$(VERSION.major).$(VERSION.mino
88
manifest_name="Manifest-v${julia_major}.toml"
99
default_manifest="${manifest_name}.default"
1010
projects=("." "examples" "test")
11+
manifest_projects=("." "examples" "test")
12+
13+
if [[ $julia_major == "1.12" ]]; then
14+
manifest_projects=(".")
15+
fi
1116

1217
delete_manifests() {
1318
local project_dir=$1
@@ -41,26 +46,42 @@ for project_dir in "${projects[@]}"; do
4146
done
4247

4348
if [[ $julia_major == "1.12" ]]; then
44-
julia --startup-file=no --project -e 'using Pkg; Pkg.update()'
45-
julia --startup-file=no --project=examples -e 'using Pkg; Pkg.update()'
46-
julia --startup-file=no --project=test -e 'using Pkg; Pkg.update()'
49+
julia --startup-file=no --project -e '
50+
using Pkg
51+
Pkg.Registry.update()
52+
for project in [".", "examples", "test"]
53+
Pkg.activate(project)
54+
Pkg.update(; update_registry=false)
55+
end
56+
'
4757
else
4858
julia --startup-file=no --project -e 'using Pkg; Pkg.instantiate()'
4959
julia --startup-file=no --project=examples -e 'using Pkg; Pkg.instantiate()'
5060
julia --startup-file=no --project=test -e 'using Pkg; Pkg.instantiate()'
5161
fi
5262

53-
for project_dir in "${projects[@]}"; do
63+
for project_dir in "${manifest_projects[@]}"; do
5464
rename_manifest "$project_dir"
5565
require_manifest "$project_dir"
5666
if [[ "$project_dir" == "." ]]; then
5767
copy_default_manifest "$project_dir"
5868
fi
5969
done
6070

71+
if [[ $julia_major == "1.12" ]]; then
72+
# Keep sub-projects manifest-free for Julia 1.12 workspace-based resolution.
73+
rm -f "examples/$manifest_name" "examples/Manifest.toml" "examples/$default_manifest"
74+
rm -f "test/$manifest_name" "test/Manifest.toml" "test/$default_manifest"
75+
fi
76+
6177
# TODO run tests
6278

6379
rm -rf ~/.julia/compiled/v${julia_major}/KiteControllers/
64-
echo "Updated ${manifest_name} files for Julia ${julia_major} in root, examples, and test!"
80+
if [[ $julia_major == "1.12" ]]; then
81+
echo "Updated ${manifest_name} in root only for Julia ${julia_major}."
82+
echo "No manifest files are kept in examples/ and test/ for Julia ${julia_major}."
83+
else
84+
echo "Updated ${manifest_name} files for Julia ${julia_major} in root, examples, and test!"
85+
fi
6586
echo "Updated ${default_manifest} in root only."
66-
echo "Make sure to run the tests before committing the new version!"
87+
echo "Make sure to run install before committing the new version!"

0 commit comments

Comments
 (0)