Skip to content

Commit 328d8df

Browse files
authored
Merge branch 'master' into master
2 parents 7cb447e + 82fee84 commit 328d8df

File tree

7 files changed

+77
-132
lines changed

7 files changed

+77
-132
lines changed

.github/workflows/benchmark.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Benchmarks
2+
on:
3+
pull_request_target:
4+
branches: [master, main]
5+
permissions:
6+
pull-requests: write
7+
8+
concurrency:
9+
# group by workflow and ref; the last slightly strange component ensures that for pull
10+
# requests, we limit to 1 concurrent job, but for the master branch we don't
11+
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main') || github.run_number }}
12+
# Cancel intermediate builds, but only if it is a pull request build.
13+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
14+
15+
jobs:
16+
benchmark:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: MilesCranmer/AirspeedVelocity.jl@action-v1
20+
with:
21+
julia-version: '1'
22+
tune: 'false'

.github/workflows/ci-pre.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: CI (Julia pre)
2+
env:
3+
JULIA_NUM_THREADS: 2
4+
concurrency:
5+
# group by workflow and ref; the last slightly strange component ensures that for pull
6+
# requests, we limit to 1 concurrent job, but for the master branch we don't
7+
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main') || github.run_number }}
8+
# Cancel intermediate builds, but only if it is a pull request build.
9+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
10+
on:
11+
pull_request:
12+
branches:
13+
- master
14+
push:
15+
branches:
16+
- master
17+
tags: '*'
18+
jobs:
19+
test:
20+
name: Julia pre - ubuntu-latest - x64 - ${{ github.event_name }}
21+
runs-on: ubuntu-latest
22+
continue-on-error: true
23+
steps:
24+
- uses: actions/checkout@v6
25+
- uses: julia-actions/setup-julia@v2
26+
with:
27+
version: pre
28+
- uses: julia-actions/cache@v2
29+
- run: sed -i '/JET/d' test/Project.toml
30+
- uses: julia-actions/julia-buildpkg@v1
31+
- uses: julia-actions/julia-runtest@v1
32+
- uses: julia-actions/julia-processcoverage@v1
33+
- uses: codecov/codecov-action@v5
34+
with:
35+
files: lcov.info
36+
token: ${{ secrets.CODECOV_TOKEN }}
37+
fail_ci_if_error: false

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,16 @@ jobs:
2525
version:
2626
- '1'
2727
- '1.10'
28-
- 'pre'
2928
os:
3029
- ubuntu-latest
3130
- macos-latest
3231
- windows-latest
3332
arch:
3433
- x64
34+
include:
35+
- version: '1'
36+
os: macos-latest
37+
arch: aarch64
3538
steps:
3639
- uses: actions/checkout@v6
3740
- uses: julia-actions/setup-julia@v2

.github/workflows/downgrade.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
- uses: julia-actions/julia-downgrade-compat@v2
2525
with:
2626
skip: Pkg,TOML,InteractiveUtils,Random,LinearAlgebra
27+
julia_version: ${{ matrix.version }}
2728
- uses: julia-actions/cache@v2
2829
- uses: julia-actions/julia-buildpkg@v1
2930
- uses: julia-actions/julia-runtest@v1

.github/workflows/postbench.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.

.github/workflows/runbenchandupload.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.

test/runtests.jl

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ using Documenter
33
using Graphs
44
using Graphs.SimpleGraphs
55
using Graphs.Experimental
6-
using JET
6+
if isempty(VERSION.prerelease)
7+
using JET
8+
end
79
using Graphs.Test
810
using Test
911
using SparseArrays
@@ -154,14 +156,16 @@ tests = [
154156
]
155157

156158
@testset verbose = true "Graphs" begin
157-
@testset "Code quality (JET.jl)" begin
158-
@assert get_pkg_version("JET") >= v"0.8.4"
159-
JET.test_package(
160-
Graphs;
161-
target_defined_modules=true,
162-
ignore_missing_comparison=true,
163-
mode=:typo, # TODO: switch back to `:basic` once the union split caused by traits is fixed
164-
)
159+
if isempty(VERSION.prerelease)
160+
@testset "Code quality (JET.jl)" begin
161+
@assert get_pkg_version("JET") >= v"0.8.4"
162+
JET.test_package(
163+
Graphs;
164+
target_defined_modules=true,
165+
ignore_missing_comparison=true,
166+
mode=:typo, # TODO: switch back to `:basic` once the union split caused by traits is fixed
167+
)
168+
end
165169
end
166170

167171
@testset "Code quality (Aqua.jl)" begin

0 commit comments

Comments
 (0)