Skip to content

Commit 42ba340

Browse files
Merge pull request #152 from JuliaPlots/bbs/update_ci
bbs/update_ci
2 parents 7fff2d5 + 77fa719 commit 42ba340

File tree

6 files changed

+93
-71
lines changed

6 files changed

+93
-71
lines changed

.github/workflows/ci.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: ci
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
defaults:
8+
run:
9+
shell: bash
10+
11+
jobs:
12+
CI:
13+
if: "!contains(github.event.head_commit.message, '[skip ci]')"
14+
env:
15+
GKS_ENCODING: "utf8"
16+
GKSwstype: "100"
17+
18+
name: Julia ${{ matrix.version }} - ${{ matrix.os }}
19+
runs-on: ${{ matrix.os }}
20+
continue-on-error: ${{ matrix.version == 'nightly' }}
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
version:
25+
- '1.0'
26+
- '1'
27+
os:
28+
- ubuntu-latest
29+
- windows-latest
30+
- macos-latest
31+
arch:
32+
- x64
33+
34+
steps:
35+
36+
# Setup environment
37+
- uses: actions/checkout@v2
38+
- uses: julia-actions/setup-julia@latest
39+
with:
40+
version: ${{ matrix.version }}
41+
- name: Cache artifacts
42+
uses: actions/cache@v1
43+
env:
44+
cache-name: cache-artifacts
45+
with:
46+
path: ~/.julia/artifacts
47+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
48+
restore-keys: |
49+
${{ runner.os }}-test-${{ env.cache-name }}-
50+
${{ runner.os }}-test-
51+
${{ runner.os }}-
52+
53+
# TESTCMD
54+
- name: Default TESTCMD
55+
run: echo "TESTCMD=julia" >> $GITHUB_ENV
56+
- name: Ubuntu TESTCMD
57+
if: startsWith(matrix.os,'ubuntu')
58+
run: echo "TESTCMD=xvfb-run --auto-servernum julia" >> $GITHUB_ENV
59+
60+
# Julia Dependencies
61+
- name: Install Julia dependencies
62+
uses: julia-actions/julia-buildpkg@latest
63+
64+
# Run tests
65+
- name: Run Graphical test
66+
run: |
67+
$TESTCMD --project -e 'using Pkg; Pkg.add("Plots"); Pkg.test(coverage=false);'
68+
69+
Skip:
70+
if: "contains(github.event.head_commit.message, '[skip ci]')"
71+
runs-on: ubuntu-latest
72+
steps:
73+
- name: Skip CI 🚫
74+
run: echo skip ci

.travis.yml

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

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1919
[compat]
2020
AbstractTrees = "0.3.1"
2121
GeometryTypes = "0.7.7, 0.8"
22-
Interpolations = "0.12.8"
22+
Interpolations = "0.12.8, 0.13.0"
2323
LightGraphs = "1.3.0"
2424
NaNMath = "0.3.3"
25-
NetworkLayout = "0.2.0"
25+
NetworkLayout = "0.2, 0.3"
2626
PlotUtils = "0.6.2, 1"
2727
RecipesBase = "0.7, 0.8, 1"
2828
julia = "^1"

appveyor.yml

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

pushtomaster.sh

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

test/figures.jl

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,44 +10,44 @@ cd(@__DIR__)
1010
include("functions.jl")
1111
include("parse_readme.jl")
1212

13-
istravis = "TRAVIS" keys(ENV)
13+
isci = "CI" keys(ENV)
1414

1515
default(show=false, reuse=true)
1616

1717
cd("../assets")
1818

1919
@testset "FIGURES" begin
20-
@plottest random_labelled_graph() "random_labelled_graph.png" popup=!istravis tol=0.03
20+
@plottest random_labelled_graph() "random_labelled_graph.png" popup=!isci tol=0.03
2121

22-
@plottest random_3d_graph() "random_3d_graph.png" popup=!istravis tol=0.02
22+
@plottest random_3d_graph() "random_3d_graph.png" popup=!isci tol=0.02
2323

24-
@plottest light_graphs() "light_graphs.png" popup=!istravis tol=0.02
24+
@plottest light_graphs() "light_graphs.png" popup=!isci tol=0.02
2525

26-
@plottest directed() "directed.png" popup=!istravis tol=0.02
26+
@plottest directed() "directed.png" popup=!isci tol=0.02
2727

28-
@plottest marker_properties() "marker_properties.png" popup=!istravis tol=0.04
28+
@plottest marker_properties() "marker_properties.png" popup=!isci tol=0.04
2929

30-
@plottest edgelabel() "edgelabel.png" popup=!istravis tol=0.1
30+
@plottest edgelabel() "edgelabel.png" popup=!isci tol=0.1
3131

32-
@plottest selfedges() "selfedges.png" popup=!istravis tol=0.02
32+
@plottest selfedges() "selfedges.png" popup=!isci tol=0.02
3333

34-
@plottest multigraphs() "multigraphs.png" popup=!istravis tol=0.1
34+
@plottest multigraphs() "multigraphs.png" popup=!isci tol=0.1
3535

36-
@plottest arc_chord_diagrams() "arc_chord_diagrams.png" popup=!istravis tol=0.02
36+
@plottest arc_chord_diagrams() "arc_chord_diagrams.png" popup=!isci tol=0.02
3737

38-
@plottest ast_example() "ast_example.png" popup=!istravis tol=0.02
38+
@plottest ast_example() "ast_example.png" popup=!isci tol=0.02
3939

40-
@plottest julia_type_tree() "julia_type_tree.png" popup=!istravis tol=0.2
40+
@plottest julia_type_tree() "julia_type_tree.png" popup=!isci tol=0.2
4141

42-
@plottest julia_dict_tree() "julia_dict_tree.png" popup=!istravis tol=0.2
42+
@plottest julia_dict_tree() "julia_dict_tree.png" popup=!isci tol=0.2
4343

44-
@plottest funky_edge_and_marker_args() "funky_edge_and_marker_args.png" popup=!istravis tol=0.2
44+
@plottest funky_edge_and_marker_args() "funky_edge_and_marker_args.png" popup=!isci tol=0.2
4545

46-
@plottest custom_nodeshapes_single() "custom_nodeshapes_single.png" popup=!istravis tol=0.2
46+
@plottest custom_nodeshapes_single() "custom_nodeshapes_single.png" popup=!isci tol=0.2
4747

48-
@plottest custom_nodeshapes_various() "custom_nodeshapes_various.png" popup=!istravis tol=0.2
48+
@plottest custom_nodeshapes_various() "custom_nodeshapes_various.png" popup=!isci tol=0.2
4949
end
5050

5151
@testset "README" begin
52-
@plottest julia_logo_pun() "readme_julia_logo_pun.png" popup=!istravis tol=0.2
52+
@plottest julia_logo_pun() "readme_julia_logo_pun.png" popup=!isci tol=0.2
5353
end

0 commit comments

Comments
 (0)