Skip to content

Commit 64718ce

Browse files
authored
Merge pull request #1858 from JuliaRobotics/25Q2/ci/fixjl12
restore ci test JL1.12 beta
2 parents aa24fbe + bd341a3 commit 64718ce

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- 'test_cases_group'
2828
steps:
2929
- uses: actions/checkout@v2
30-
- uses: julia-actions/setup-julia@v1
30+
- uses: julia-actions/setup-julia@v2
3131
with:
3232
version: ${{ matrix.version }}
3333
arch: ${{ matrix.arch }}
@@ -55,12 +55,12 @@ jobs:
5555
arch:
5656
- x64
5757
version:
58-
- '1.11'
58+
- '~1.12.0-0'
5959
group:
6060
- 'basic_functional_group'
6161
steps:
6262
- uses: actions/checkout@v2
63-
- uses: julia-actions/setup-julia@v1
63+
- uses: julia-actions/setup-julia@v2
6464
with:
6565
version: ${{ matrix.version }}
6666
arch: ${{ matrix.arch }}
@@ -97,12 +97,12 @@ jobs:
9797
arch:
9898
- x64
9999
version:
100-
- '1.11'
100+
- '~1.12.0-0'
101101
group:
102102
- 'test_cases_group'
103103
steps:
104104
- uses: actions/checkout@v2
105-
- uses: julia-actions/setup-julia@v1
105+
- uses: julia-actions/setup-julia@v2
106106
with:
107107
version: ${{ matrix.version }}
108108
arch: ${{ matrix.arch }}
@@ -140,15 +140,15 @@ jobs:
140140
os:
141141
- ubuntu-latest
142142
version:
143-
- '1.11'
143+
- '~1.12.0-0'
144144
arch:
145145
- x64
146146
group:
147147
- 'tmp_debug_group'
148148
continue-on-error: true
149149
steps:
150150
- uses: actions/checkout@v2
151-
- uses: julia-actions/setup-julia@v1
151+
- uses: julia-actions/setup-julia@v2
152152
with:
153153
version: ${{ matrix.version }}
154154
arch: ${{ matrix.arch }}

test/testSpecialOrthogonalMani.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ using Test
1111

1212
##
1313

14-
# see AMP v0.7.1+
15-
# Base.convert(::Type{<:Tuple}, M::SpecialOrthogonal{2}) = (:Circular,)
16-
# Base.convert(::Type{<:Tuple}, ::IIF.InstanceType{SpecialOrthogonal{2}}) = (:Circular,)
17-
# Base.convert(::Type{<:Tuple}, ::Type{SpecialOrthogonal{2}}) = (:Circular,)
18-
1914
# @defVariable SpecialOrthogonal2 SpecialOrthogonal(2) @MMatrix([1.0 0.0; 0.0 1.0])
2015
@defVariable SpecialOrthogonal2 SpecialOrthogonal(2) SMatrix{2,2}(1.0, 0.0, 0.0, 1.0)
2116

@@ -99,7 +94,8 @@ vnd = getVariableSolverData(fg, :x0)
9994
@test all(is_point.(Ref(M), vnd.val))
10095

10196
points = sampleFactor(fg, :x0f1, 100)
102-
std(SpecialOrthogonal(3), points)
97+
_M = SpecialOrthogonal(3)
98+
std(_M, points .|> Matrix)
10399

104100
##
105101

0 commit comments

Comments
 (0)