Skip to content

Commit

Permalink
Merge branch 'compat' into 'main'
Browse files Browse the repository at this point in the history
Fix compat

See merge request acubesat/adcs/adcs-simulation-julia!5
  • Loading branch information
xlxs4 committed Sep 13, 2023
2 parents bd57880 + fd3d01b commit aa8349a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.9'
- 'nightly'
os:
- ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Pkg
Pkg.build()
Pkg.test()'
Julia 1.10:
image: julia:1.10.0-beta2-bookworm
Julia 1.9:
image: julia:1.9
extends:
- .script
10 changes: 5 additions & 5 deletions Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.10.0-beta2"
manifest_format = "2.0"
project_hash = "d2153bff797d1f45fcfbad94a8711874cae1b019"
project_hash = "889658496d6fa3bcb31badd691b361c0a40fa9fb"

[[deps.Accessors]]
deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "LinearAlgebra", "MacroTools", "Requires", "Test"]
Expand Down Expand Up @@ -675,9 +675,9 @@ version = "1.4.1"

[[deps.OpenSSL_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "bbb5c2115d63c2f1451cb70e5ef75e8fe4707019"
git-tree-sha1 = "a12e56c72edee3ce6b96667745e6cbbe5498f200"
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
version = "1.1.22+0"
version = "1.1.23+0"

[[deps.OpenSpecFun_jll]]
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
Expand Down Expand Up @@ -980,9 +980,9 @@ version = "1.1.1"

[[deps.SpaceIndices]]
deps = ["Dates", "DelimitedFiles", "OptionalData", "Reexport", "Scratch"]
git-tree-sha1 = "0329173419328166fd0eae5ec92fa40f98f19a79"
git-tree-sha1 = "6e9a0737eca196a475fa8a7538cadd1aa5aa43d8"
uuid = "5a540a4e-639f-452a-b107-23ea09ed4d36"
version = "1.1.0"
version = "1.1.1"

[[deps.SparseArrays]]
deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"]
Expand Down
9 changes: 8 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@ SatelliteToolboxGeomagneticField = "9fc549ba-b5d7-49a2-b268-8171e5fb6e89"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[compat]
julia = "1.10"
ConcreteStructs = "0.2"
Optim = "1"
Plots = "1"
SatelliteDynamics = "0.4"
SatelliteToolbox = "0.12"
SatelliteToolboxGeomagneticField = "0.1"

julia = "1.9"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down

0 comments on commit aa8349a

Please sign in to comment.