Skip to content

Commit

Permalink
update CI script (#137)
Browse files Browse the repository at this point in the history
* update CI script
  • Loading branch information
KristofferC authored Sep 22, 2021
1 parent c3a4dde commit da118dd
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 53 deletions.
48 changes: 38 additions & 10 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,50 @@
name: CI

on: [push]

on:
pull_request:
branches:
- master
push:
branches:
- master
tags: '*'
jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
julia-version: ['1', 'nightly']
julia-arch: [x64]
os: [ubuntu-latest, macOS-latest, windows-latest]

version:
- '1.0'
- '1'
- 'nightly'
os:
- ubuntu-latest
- macOS-latest
- windows-latest
arch:
- x64
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.julia-version }}
- uses: julia-actions/julia-runtest@latest
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
env:
JULIA_NUM_THREADS: 2
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
with:
file: lcov.info
42 changes: 0 additions & 42 deletions appveyor.yml

This file was deleted.

3 changes: 2 additions & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,7 @@ end
@test match(r"cccc", table).offset < match(r"bbbb", table).offset < match(r"aaaa", table).offset
end

@static if isdefined(Threads, Symbol("@spawn"))
@testset "merge at custom points during multithreading" begin
to = TimerOutput()
@timeit to "1" begin
Expand Down Expand Up @@ -619,5 +620,5 @@ end
@test "3.2.1" in collect(keys(to32.inner_timers))
@test ncalls(to32.inner_timers["3.2.1"]) == 1
@test !in("3.1.1", collect(keys(to32.inner_timers)))

end
end

0 comments on commit da118dd

Please sign in to comment.