Skip to content

Commit ab636f5

Browse files
dehanndehann
authored
Merge branch 'develop' into 26Q2/up/iif38
2 parents 9ac88d1 + 51873eb commit ab636f5

7 files changed

Lines changed: 63 additions & 52 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
- package-ecosystem: "julia"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"
11+
groups: # to group all julia package updates into a single PR
12+
all-julia-packages:
13+
patterns:
14+
- "*"

‎.github/workflows/CompatHelper.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
run: which julia
1616
continue-on-error: true
1717
- name: Install Julia, but only if it is not already available in the PATH
18-
uses: julia-actions/setup-julia@v1
18+
uses: julia-actions/setup-julia@v3
1919
with:
2020
version: '1'
2121
# arch: ${{ runner.arch }}

‎.github/workflows/Formatter.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
name: "Format Check"
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
14-
- uses: julia-actions/setup-julia@v1
13+
- uses: actions/checkout@v6
14+
- uses: julia-actions/setup-julia@v3
1515
with:
1616
version: 1
17-
- uses: julia-actions/cache@v1
17+
- uses: julia-actions/cache@v3
1818
- name: Install JuliaFormatter and format
1919
run: |
2020
using Pkg

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ jobs:
3535
- x64
3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v6
3939

4040
- name: Setup Julia
41-
uses: julia-actions/setup-julia@v2
41+
uses: julia-actions/setup-julia@v3
4242
with:
4343
version: ${{ matrix.version }}
4444
arch: ${{ matrix.arch }}
4545

4646
- name: Cache Artifacts
47-
uses: julia-actions/cache@v2
47+
uses: julia-actions/cache@v3
4848

4949
- name: Julia Build Pkg
5050
uses: julia-actions/julia-buildpkg@latest
@@ -69,10 +69,10 @@ jobs:
6969
continue-on-error: true
7070
steps:
7171
- name: Checkout
72-
uses: actions/checkout@v2
72+
uses: actions/checkout@v6
7373

7474
- name: Setup julia
75-
uses: julia-actions/setup-julia@v2
75+
uses: julia-actions/setup-julia@v3
7676
with:
7777
version: '1.12'
7878
arch: x64

‎Project.toml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ LieGroups = "0.1"
5858
LinearAlgebra = "1.11"
5959
MIMEs = "1.1"
6060
ManifoldsBase = "1, 2"
61-
OrderedCollections = "1.4"
61+
OrderedCollections = "1.4, 2"
6262
Pkg = "1.4, 1.5"
6363
ProgressMeter = "1"
6464
Random = "1.11"
65-
RecursiveArrayTools = "3"
65+
RecursiveArrayTools = "3, 4"
6666
SHA = "0.7, 1"
6767
SparseArrays = "1.11"
6868
StaticArrays = "1"
@@ -88,3 +88,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
8888

8989
[targets]
9090
test = ["Aqua", "Test", "GraphMakie", "LinearAlgebra", "Pkg", "Statistics", "LieGroups"]
91+
92+
[workspace]
93+
projects = ["test"]

‎test/Project.toml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[deps]
2+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
3+
CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
4+
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
5+
DistributedFactorGraphs = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
6+
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
7+
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
8+
GraphMakie = "1ecd5474-83a3-4783-bb4f-06765db800d2"
9+
IncrementalInference = "904591bb-b899-562f-9e6f-b8df64c7d480"
10+
IncrementalInferenceTypes = "9808408f-4dbc-47e4-913c-6068b950e289"
11+
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
12+
LieGroups = "6774de46-80ba-43f8-ba42-e41071ccfc5f"
13+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
14+
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
15+
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
16+
SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
17+
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
18+
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
19+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
20+
TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
21+
TimesDates = "bdfc003b-8df8-5c39-adcd-3a9087f5df4a"
22+
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
23+
24+
[compat]
25+
Aqua = "0.8"
26+
GraphMakie = "0.5.14, 0.6"
27+
LieGroups = "0.1"
28+
LinearAlgebra = "1.11"
29+
Pkg = "1.4, 1.5"
30+
Statistics = "1.11"
31+
Test = "1.11"
32+
33+
[sources]
34+
IncrementalInference = {url = "https://github.com/JuliaRobotics/IncrementalInference.jl", rev = "release/v0.37", subdir = "IncrementalInference"}
35+
IncrementalInferenceTypes = {url = "https://github.com/JuliaRobotics/IncrementalInference.jl", rev = "release/v0.37", subdir = "IncrementalInferenceTypes"}

‎test/runtests.jl‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -77,47 +77,6 @@ DFG.@usingDFG true
7777
end
7878

7979
if get(ENV, "IIF_TEST", "true") == "true"
80-
81-
# Switch to our upstream test branch.
82-
#FIXME This is a temporary fix to use the develop branch of AMP.
83-
# Pkg.add(PackageSpec(; name = "ApproxManifoldProducts", rev = "develop"))
84-
#FIXME This is a temporary fix to use the develop branch of IIF.
85-
# Pkg.add(PackageSpec(; name = "IncrementalInference", rev = "upstream/dfg_integration_test"))
86-
# Pkg.add(PackageSpec(; name = "IncrementalInference", rev = "develop"))
87-
if get(ENV, "IIF_TEST_DEV", "true") == "true"
88-
Pkg.add(
89-
PackageSpec(;
90-
url = "https://github.com/JuliaRobotics/IncrementalInference.jl.git",
91-
subdir = "IncrementalInferenceTypes",
92-
rev = "develop",
93-
),
94-
)
95-
Pkg.add(
96-
PackageSpec(;
97-
url = "https://github.com/JuliaRobotics/IncrementalInference.jl.git",
98-
subdir = "IncrementalInference",
99-
rev = "develop",
100-
),
101-
)
102-
else
103-
Pkg.develop(;
104-
path = joinpath(
105-
DEPOT_PATH[1],
106-
"dev",
107-
"IncrementalInference",
108-
"IncrementalInferenceTypes",
109-
),
110-
)
111-
Pkg.develop(;
112-
path = joinpath(
113-
DEPOT_PATH[1],
114-
"dev",
115-
"IncrementalInference",
116-
"IncrementalInference",
117-
),
118-
)
119-
end
120-
12180
@info "------------------------------------------------------------------------"
12281
@info "These tests are using IncrementalInference to do additional driver tests"
12382
@info "------------------------------------------------------------------------"

0 commit comments

Comments
 (0)