Skip to content

Commit cdde346

Browse files
authored
CI: Test both incremental={true,false} on "slow CI"; also, stop considering Apple Silicon macOS as "slow CI" (#983)
1 parent f5eba5f commit cdde346

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

test/runtests.jl

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@ ENV["JULIA_DEPOT_PATH"] = new_depot
1414
Base.init_depot_path()
1515

1616
const is_ci = tryparse(Bool, get(ENV, "CI", "")) === true
17-
const is_slow_ci = is_ci && Sys.ARCH == :aarch64
17+
const is_apple_silicon_macos = Sys.ARCH == :aarch64 && Sys.isapple()
18+
19+
# In order to be "slow CI", we must meet all of the following:
20+
# 1. We are running on CI.
21+
# 2. We are running on aarch64 (arm64).
22+
# 3. We are NOT running on Apple Silicon macOS.
23+
# (Because for GitHub Actions, the GitHub-hosted Apple Silicon
24+
# macOS runners seem to be quite fast.)
25+
const is_slow_ci = is_ci && Sys.ARCH == :aarch64 && !is_apple_silicon_macos
26+
1827
const is_julia_1_6 = VERSION.major == 1 && VERSION.minor == 6
1928
const is_julia_1_9 = VERSION.major == 1 && VERSION.minor == 9
2029
const is_julia_1_11 = VERSION.major == 1 && VERSION.minor == 11
@@ -85,7 +94,12 @@ end
8594
# Test creating an app
8695
app_source_dir = joinpath(@__DIR__, "..", "examples/MyApp/")
8796
app_compiled_dir = joinpath(tmp, "MyAppCompiled")
88-
@testset for incremental in (is_slow_ci ? (false,) : (true, false))
97+
if is_slow_ci
98+
incrementals_list = (true, false)
99+
else
100+
incrementals_list = (true, false)
101+
end
102+
@testset for incremental in incrementals_list
89103
if incremental == false
90104
if is_julia_1_11 || is_julia_1_12
91105
# On Julia 1.11 and 1.12, `incremental=false` is currently broken.
@@ -96,7 +110,11 @@ end
96110
@test_skip false
97111
continue
98112
end
99-
filter_stdlibs = (is_slow_ci ? (true, ) : (true, false))
113+
if is_slow_ci
114+
filter_stdlibs = (true,)
115+
else
116+
filter_stdlibs = (true, false)
117+
end
100118
else
101119
filter_stdlibs = (false,)
102120
end

0 commit comments

Comments
 (0)