Skip to content

Commit 7835d7f

Browse files
committed
Merge remote-tracking branch 'origin/main' into breaking
2 parents f8a91a1 + 905f7fa commit 7835d7f

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

.github/workflows/Tests.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,20 @@ jobs:
3535
- name: "everything else"
3636
args: "--skip mcmc/gibbs.jl mcmc/Inference.jl ad.jl"
3737
runner:
38-
# TODO(mhauru) All the ones below that run on 1.11 should actually be run on 1.
39-
# The current setup is a temporary arrangement to deal with issues where Mooncake
40-
# and Libtask are broken on 1.12.
4138
# Default
42-
- version: '1.11'
39+
- version: '1'
4340
os: ubuntu-latest
4441
num_threads: 1
4542
# Multithreaded
46-
- version: '1.11'
43+
- version: '1'
4744
os: ubuntu-latest
4845
num_threads: 2
4946
# Windows
50-
- version: '1.11'
47+
- version: '1'
5148
os: windows-latest
5249
num_threads: 1
5350
# macOS
54-
- version: '1.11'
51+
- version: '1'
5552
os: macos-latest
5653
num_threads: 1
5754
# Minimum supported Julia version

test/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ Combinatorics = "1"
5353
Distributions = "0.25"
5454
DistributionsAD = "0.6.3"
5555
DynamicHMC = "2.1.6, 3.0"
56+
DynamicPPL = "0.38"
5657
FiniteDifferences = "0.10.8, 0.11, 0.12"
5758
ForwardDiff = "0.10.12 - 0.10.32, 0.10, 1"
5859
HypothesisTests = "0.11"

test/ad.jl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ using Test
1010
using ..Models: gdemo_default
1111
import ForwardDiff, ReverseDiff
1212

13-
# Detect if prerelease version, if so, we skip some tests
14-
const IS_PRERELEASE = !isempty(VERSION.prerelease)
15-
const INCLUDE_MOONCAKE = !IS_PRERELEASE
16-
13+
# Skip Mooncake on 1.12 as it is not compatible yet
14+
const INCLUDE_MOONCAKE = VERSION < v"1.12"
1715
if INCLUDE_MOONCAKE
1816
import Pkg
1917
Pkg.add("Mooncake")

0 commit comments

Comments
 (0)