Skip to content

Commit 2d42ae3

Browse files
authored
Merge pull request #1872 from JuliaRobotics/refac/types
Splitting out IIFTypes as a separate module.
2 parents 7dc8f3c + f027f41 commit 2d42ae3

File tree

180 files changed

+415
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+415
-397
lines changed

.github/workflows/ci.yml

Lines changed: 33 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ on:
99

1010
jobs:
1111
test-stable:
12-
name: JL${{ matrix.version }} - ${{ matrix.arch }} - ${{ matrix.group }} - ${{ matrix.os }}
12+
name: Stable JL-${{ matrix.version }} - ${{ matrix.group }}
1313
runs-on: ${{ matrix.os }}
1414
env:
1515
JULIA_PKG_SERVER: ""
1616
strategy:
1717
fail-fast: false
1818
matrix:
1919
version:
20-
- '1.11'
20+
- 'lts'
2121
os:
2222
- ubuntu-latest
2323
arch:
@@ -26,26 +26,33 @@ jobs:
2626
- 'basic_functional_group'
2727
- 'test_cases_group'
2828
steps:
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v4
3030
- uses: julia-actions/setup-julia@v2
3131
with:
3232
version: ${{ matrix.version }}
3333
arch: ${{ matrix.arch }}
34-
- uses: julia-actions/cache@v1
34+
- uses: julia-actions/cache@v2
3535
- uses: julia-actions/julia-buildpkg@v1
36-
- uses: julia-actions/julia-runtest@v1
37-
continue-on-error: ${{ matrix.version == 'nightly' }}
36+
- name: Dev dependencies
37+
shell: julia --project=monorepo {0}
38+
run: |
39+
using Pkg;
40+
Pkg.develop([PackageSpec(path="IncrementalInference"), PackageSpec(path="IncrementalInferenceTypes")]);
41+
- name: Run tests
42+
continue-on-error: ${{ matrix.group == 'tmp_debug_group' }}
3843
env:
3944
IIF_TEST_GROUP: ${{ matrix.group }}
45+
run: >
46+
julia --color=yes --project=monorepo -e 'using Pkg; Pkg.test("IncrementalInference")'
4047
- uses: julia-actions/julia-processcoverage@v1
4148
- uses: codecov/codecov-action@v2
4249
with:
4350
files: lcov.info
4451
fail_ci_if_error: false
4552
if: ${{ matrix.version != 'nightly' }}
4653

47-
upstream-dev-functional:
48-
name: Upstr Dev Functional
54+
upstream-dev:
55+
name: Develop JL-${{ matrix.version }} - ${{ matrix.group }}
4956
runs-on: ubuntu-latest
5057
env:
5158
JULIA_PKG_SERVER: ""
@@ -55,105 +62,32 @@ jobs:
5562
arch:
5663
- x64
5764
version:
58-
- '~1.12.0-0'
65+
- '1'
5966
group:
6067
- 'basic_functional_group'
61-
steps:
62-
- uses: actions/checkout@v2
63-
- uses: julia-actions/setup-julia@v2
64-
with:
65-
version: ${{ matrix.version }}
66-
arch: ${{ matrix.arch }}
67-
- uses: actions/cache@v4
68-
env:
69-
cache-name: cache-artifacts
70-
with:
71-
path: ~/.julia/artifacts
72-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
73-
restore-keys: |
74-
${{ runner.os }}-test-${{ env.cache-name }}-
75-
${{ runner.os }}-test-
76-
${{ runner.os }}-
77-
- run: |
78-
git config --global user.name Tester
79-
git config --global user.email te@st.er
80-
- name: Upst Dev Functional
81-
env:
82-
IIF_TEST_GROUP: ${{ matrix.group }}
83-
run: |
84-
julia --project=@. --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(name="ApproxManifoldProducts",rev="develop"));'
85-
julia --project=@. --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(name="DistributedFactorGraphs",rev="develop"));'
86-
julia --project=@. --check-bounds=yes -e 'using Pkg; Pkg.test("IncrementalInference"; coverage=false)'
87-
shell: bash
88-
89-
upstream-dev-cases:
90-
name: Upstr Dev Test Cases
91-
runs-on: ubuntu-latest
92-
env:
93-
JULIA_PKG_SERVER: ""
94-
strategy:
95-
fail-fast: false
96-
matrix:
97-
arch:
98-
- x64
99-
version:
100-
- '~1.12.0-0'
101-
group:
10268
- 'test_cases_group'
103-
steps:
104-
- uses: actions/checkout@v2
105-
- uses: julia-actions/setup-julia@v2
106-
with:
107-
version: ${{ matrix.version }}
108-
arch: ${{ matrix.arch }}
109-
- uses: actions/cache@v4
110-
env:
111-
cache-name: cache-artifacts
112-
with:
113-
path: ~/.julia/artifacts
114-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
115-
restore-keys: |
116-
${{ runner.os }}-test-${{ env.cache-name }}-
117-
${{ runner.os }}-test-
118-
${{ runner.os }}-
119-
- run: |
120-
git config --global user.name Tester
121-
git config --global user.email te@st.er
122-
- name: Upstr Dev Cases
123-
env:
124-
IIF_TEST_GROUP: ${{ matrix.group }}
125-
run: |
126-
julia --project=@. --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(name="ApproxManifoldProducts",rev="develop"));'
127-
julia --project=@. --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(name="DistributedFactorGraphs",rev="develop"));'
128-
julia --project=@. --check-bounds=yes -e 'using Pkg; Pkg.test("IncrementalInference"; coverage=false)'
129-
shell: bash
130-
131-
test-debug-group:
132-
needs: [ upstream-dev-functional ]
133-
name: JL${{ matrix.version }} - ${{ matrix.group }} - ${{ matrix.os }}
134-
runs-on: ${{ matrix.os }}
135-
env:
136-
JULIA_PKG_SERVER: ""
137-
strategy:
138-
fail-fast: false
139-
matrix:
140-
os:
141-
- ubuntu-latest
142-
version:
143-
- '~1.12.0-0'
144-
arch:
145-
- x64
146-
group:
14769
- 'tmp_debug_group'
148-
continue-on-error: true
14970
steps:
150-
- uses: actions/checkout@v2
71+
- uses: actions/checkout@v4
15172
- uses: julia-actions/setup-julia@v2
15273
with:
15374
version: ${{ matrix.version }}
15475
arch: ${{ matrix.arch }}
155-
- uses: julia-actions/cache@v1
156-
- uses: julia-actions/julia-buildpkg@v1
157-
- uses: julia-actions/julia-runtest@v1
76+
- uses: julia-actions/cache@v2
77+
# - run: |
78+
# git config --global user.name Tester
79+
# git config --global user.email te@st.er
80+
- name: Dev dependencies
81+
shell: julia --project=monorepo {0}
82+
run: |
83+
using Pkg;
84+
Pkg.add(PackageSpec(name="DistributedFactorGraphs",rev="develop"))
85+
Pkg.add(PackageSpec(name="ApproxManifoldProducts",rev="develop"));
86+
Pkg.develop([PackageSpec(path="IncrementalInference"), PackageSpec(path="IncrementalInferenceTypes")]);
87+
- name: Run tests
88+
continue-on-error: ${{ matrix.group == 'tmp_debug_group' }}
15889
env:
15990
IIF_TEST_GROUP: ${{ matrix.group }}
91+
run: >
92+
julia --color=yes --project=monorepo -e 'using Pkg; Pkg.test("IncrementalInference")'
93+

Project.toml renamed to IncrementalInference/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
2121
FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
2222
FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000"
2323
FunctionalStateMachine = "3e9e306e-7e3c-11e9-12d2-8f8f67a2f951"
24+
IncrementalInferenceTypes = "9808408f-4dbc-47e4-913c-6068b950e289"
2425
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
2526
KernelDensityEstimate = "2472808a-b354-52ea-a80e-1658a3c6056d"
2627
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
File renamed without changes.

0 commit comments

Comments
 (0)