Skip to content

Commit b4318b5

Browse files
authored
Merge pull request #70 from aefarrell/refactor-github-actions
Reducing the burden of Github Actions
2 parents a997019 + e0a897e commit b4318b5

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

.github/workflows/CI.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: CI
2-
on: [push, pull_request, workflow_dispatch]
2+
on: [pull_request, workflow_dispatch]
33
jobs:
44
test:
55
name: ${{ matrix.group }} Tests - Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -9,8 +9,6 @@ jobs:
99
matrix:
1010
group:
1111
- Base
12-
- Util
13-
- Model
1412
- Ext
1513
- Doc
1614
version:
@@ -19,8 +17,8 @@ jobs:
1917
- 'nightly'
2018
os:
2119
- ubuntu-latest
22-
- windows-latest
23-
- macOS-latest
20+
# - windows-latest
21+
# - macOS-latest
2422
arch:
2523
- x64
2624
steps:

test/runtests.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using DelimitedFiles: readdlm
44
const GROUP = get(ENV,"GROUP","All")
55
const VERSION = get(ENV,"VERSION","latest")
66

7-
if GROUP == "All" || GROUP == "Base"
7+
if GROUP ["All", "Base"]
88
@testset "GasDispersion.jl tests" begin
99
@test_throws MethodError scenario_builder()
1010

@@ -17,15 +17,11 @@ if GROUP == "All" || GROUP == "Base"
1717

1818
# testing plot recipes
1919
include("base/recipe_tests.jl")
20-
end
2120

22-
if GROUP == "All" || GROUP == "Util"
2321
# testing utilities
2422
include("utils/util_tests.jl")
2523
include("depreciation/depreciation_tests.jl")
26-
end
2724

28-
if GROUP == "All" || GROUP == "Model"
2925
# testing source models
3026
include("source_models/jet_source_tests.jl")
3127

@@ -51,6 +47,6 @@ end
5147

5248
# some doc tests don't work with julia 1.3, because of Documenter
5349
# but I still want to run them in the tests sometimes
54-
if GROUP == "Doc" && VERSION != "1.3"
50+
if GROUP ["All", "Doc"] && VERSION != "1.3"
5551
doctest(GasDispersion, fix=false)
5652
end

0 commit comments

Comments
 (0)