Skip to content

Commit 129fc4c

Browse files
AffieAffie
authored
Update CI, fix BE.size default and rm some deprecated code (#1117)
* Fix BE.size default and rm some deprecated code * update CI * update stale links --------- Co-authored-by: Johannes Terblanche <Affie@users.noreply.github.com>
1 parent e210244 commit 129fc4c

File tree

6 files changed

+28
-38
lines changed

6 files changed

+28
-38
lines changed

‎.github/workflows/ci.yml

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,67 +8,59 @@ on:
88
tags:
99
- v**
1010
workflow_dispatch:
11+
concurrency:
12+
# Skip intermediate builds: always.
13+
# Cancel intermediate builds: only if it is a pull request build.
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
1116
jobs:
1217
test:
1318
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
1419
runs-on: ${{ matrix.os }}
15-
env:
16-
JULIA_PKG_SERVER: ""
20+
timeout-minutes: 60
21+
permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
22+
actions: write
23+
contents: read
1724
strategy:
1825
fail-fast: false
1926
matrix:
2027
version:
21-
- '1.10'
22-
- 'nightly'
28+
- 'lts' # long term support
29+
- '1' # stable
30+
# - 'pre' # pre-release
2331
os:
2432
- ubuntu-latest
2533
arch:
2634
- x64
2735
steps:
2836
- name: Checkout
29-
uses: actions/checkout@v2
37+
uses: actions/checkout@v4
3038

3139
- name: Setup Julia
32-
uses: julia-actions/setup-julia@v1
40+
uses: julia-actions/setup-julia@v2
3341
with:
3442
version: ${{ matrix.version }}
3543
arch: ${{ matrix.arch }}
3644

3745
- name: Cache Artifacts
38-
uses: actions/cache@v1
39-
env:
40-
cache-name: cache-artifacts
41-
with:
42-
path: ~/.julia/artifacts
43-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
44-
restore-keys: |
45-
${{ runner.os }}-test-${{ env.cache-name }}-
46-
${{ runner.os }}-test-
47-
${{ runner.os }}-
46+
uses: julia-actions/cache@v2
4847

4948
- name: Julia Build Pkg
5049
uses: julia-actions/julia-buildpkg@latest
51-
52-
- name: Git Test Credentials
53-
run: |
54-
git config --global user.name Tester
55-
git config --global user.email te@st.er
56-
50+
5751
- name: Run tests
5852
env:
5953
IIF_TEST: true
60-
DO_CGDFG_TESTS: false
61-
DFG_USE_CGDFG: false
62-
uses: julia-actions/julia-runtest@latest
63-
continue-on-error: ${{ matrix.version == 'nightly' }}
64-
54+
uses: julia-actions/julia-runtest@latest
6555
- name: Process Coverage
6656
uses: julia-actions/julia-processcoverage@v1
6757

6858
- name: Code Coverage
69-
uses: codecov/codecov-action@v1
59+
uses: codecov/codecov-action@v4
7060
with:
71-
file: lcov.info
61+
files: lcov.info
62+
token: ${{ secrets.CODECOV_TOKEN }}
63+
fail_ci_if_error: false
7264

7365
docs:
7466
needs: test
@@ -80,9 +72,9 @@ jobs:
8072
uses: actions/checkout@v2
8173

8274
- name: Setup julia
83-
uses: julia-actions/setup-julia@v1
75+
uses: julia-actions/setup-julia@v2
8476
with:
85-
version: '1.10'
77+
version: 'lts'
8678
arch: x64
8779

8880
- name: Build Docs

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Click on badges to follow links:
1010
[dfg-ci-dev-url]: https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/actions/workflows/ci.yml
1111
[dfg-ci-stb-img]: https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/actions/workflows/ci.yml/badge.svg?branch=release%2Fv0.25
1212
[dfg-ci-stb-url]: https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/actions/workflows/ci.yml
13-
[dfg-cov-img]: https://codecov.io/github/JuliaRobotics/DistributedFactorGraphs.jl/coverage.svg?branch=master
14-
[dfg-cov-url]: https://codecov.io/github/JuliaRobotics/DistributedFactorGraphs.jl?branch=master
13+
[dfg-cov-img]: https://codecov.io/github/JuliaRobotics/DistributedFactorGraphs.jl/coverage.svg?branch=develop
14+
[dfg-cov-url]: https://codecov.io/github/JuliaRobotics/DistributedFactorGraphs.jl?branch=develop
1515
[dfg-build-img]: https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/actions/workflows/ci.yml/badge.svg
1616
[dfg-build-url]: https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/actions/workflows/ci.yml
1717

@@ -23,7 +23,7 @@ DistributedFactorGraphs.jl provides a flexible factor graph API for use in the [
2323
**Note** this package is still under initial development, and will adopt parts of the functionality currently contained in [IncrementalInference.jl](http://www.github.com/JuliaRobotics/IncrementalInference.jl).
2424

2525
# Documentation
26-
Please see the [documentation](http://juliarobotics.github.io/DistributedFactorGraphs.jl/latest/) and the [unit tests](https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/tree/master/test) for examples on using DistributedFactorGraphs.jl.
26+
Please see the [documentation](http://juliarobotics.github.io/DistributedFactorGraphs.jl/latest/) and the [unit tests](https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/tree/develop/test) for examples on using DistributedFactorGraphs.jl.
2727

2828
# Installation
2929
DistributedFactorGraphs can be installed from Julia packages using:

‎src/DataBlobs/entities/BlobEntry.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Base.@kwdef struct BlobEntry
2828
""" Context from which a BlobEntry=>Blob was first created. E.g. agent|graph|varlabel. """
2929
origin::String = ""
3030
""" number of bytes in blob as a string"""
31-
size::Union{String, Nothing} = "" #TODO remove union, use "" as nothing
31+
size::Union{String, Nothing} = "-1" #TODO remove union -> size::String = "-1"
3232
""" Additional information that can help a different user of the Blob. """
3333
description::String = ""
3434
""" MIME description describing the format of binary data in the `Blob`, e.g. 'image/png' or 'application/json; _type=CameraModel'. """

‎src/GraphsDFG/services/GraphsDFG.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ function getVariables(
197197
tags::Vector{Symbol} = Symbol[],
198198
solvable::Int = 0,
199199
solvableFilter::Union{Nothing, Base.Fix2} = nothing,
200-
detail = nothing,
201200
)
202201

203202
# variables = map(v -> v.dfgNode, filter(n -> n.dfgNode isa VariableCompute, vertices(dfg.g)))

‎src/entities/DFGFactor.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ function FactorDFG(
158158
nstime = string(nstime),
159159
fnctype,
160160
solvable,
161-
data = base64encode(JSON3.write(factordata)),
161+
data = JSON3.write(factordata),
162162
metadata = base64encode(JSON3.write(metadata)),
163163
)
164164

‎src/services/AbstractDFG.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ function getVariables(
429429
regexFilter::Union{Nothing, Regex} = nothing;
430430
tags::Vector{Symbol} = Symbol[],
431431
solvable::Int = 0,
432-
detail = nothing,
433432
) where {G <: AbstractDFG}
434433
return error("getVariables not implemented for $(typeof(dfg))")
435434
end

0 commit comments

Comments
 (0)