Skip to content

Commit b0238a3

Browse files
authored
Merge pull request #293 from inkydragon/ci
2 parents c1913fa + f7fc032 commit b0238a3

File tree

5 files changed

+27
-45
lines changed

5 files changed

+27
-45
lines changed

.github/workflows/CI.yml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,17 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
version:
16-
- "1.0" # LTS
17-
- "1" # Latest Release
16+
- "lts"
17+
- "1" # Latest Release
1818
os:
1919
- ubuntu-latest
20-
- macOS-latest
20+
- macOS-latest # Apple silicon
2121
- windows-latest
22-
arch:
23-
- x86
24-
- x64
25-
exclude:
26-
# 32-bit Julia binaries are not available on macOS
27-
- os: macOS-latest
28-
arch: x86
2922
steps:
30-
- uses: actions/checkout@v2
31-
- uses: julia-actions/setup-julia@v1
23+
- uses: actions/checkout@v4
24+
- uses: julia-actions/setup-julia@v2
3225
with:
3326
version: ${{ matrix.version }}
34-
arch: ${{ matrix.arch }}
35-
- uses: actions/cache@v2
36-
env:
37-
cache-name: cache-artifacts
38-
with:
39-
path: ~/.julia/artifacts
40-
key: ${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
41-
restore-keys: |
42-
${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-
43-
${{ runner.os }}-${{ matrix.arch }}-test-
44-
${{ runner.os }}-${{ matrix.arch }}-
45-
${{ runner.os }}-
27+
- uses: julia-actions/cache@v2
4628
- uses: julia-actions/julia-buildpkg@v1
4729
- uses: julia-actions/julia-runtest@v1
48-

.github/workflows/Documenter.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
name: Documentation
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
14-
- uses: julia-actions/setup-julia@v1
13+
- uses: actions/checkout@v4
14+
- uses: julia-actions/setup-julia@v2
1515
with:
16-
version: '1.6'
17-
- uses: julia-actions/julia-docdeploy@latest
16+
version: '1.10'
17+
- uses: julia-actions/julia-docdeploy@v1
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}

.github/workflows/JuliaNightly.yml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,22 @@ on:
77
branches: [master]
88
tags: ["*"]
99
pull_request:
10+
1011
jobs:
1112
test:
1213
name: Julia Nightly - Ubuntu - x64
1314
runs-on: ubuntu-latest
1415
steps:
15-
- uses: actions/checkout@v2
16-
- uses: julia-actions/setup-julia@v1
16+
- uses: actions/checkout@v4
17+
- uses: julia-actions/setup-julia@v2
1718
with:
1819
version: nightly
19-
arch: x64
20-
- uses: actions/cache@v2
21-
env:
22-
cache-name: julia-nightly-cache-artifacts
23-
with:
24-
path: ~/.julia/artifacts
25-
key: ${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
26-
restore-keys: |
27-
${{ env.cache-name }}-
28-
- uses: julia-actions/julia-buildpkg@latest
29-
- uses: julia-actions/julia-runtest@latest
20+
- uses: julia-actions/cache@v2
21+
- uses: julia-actions/julia-buildpkg@v1
22+
- uses: julia-actions/julia-runtest@v1
3023
- uses: julia-actions/julia-processcoverage@v1
31-
- uses: codecov/codecov-action@v1
24+
- uses: codecov/codecov-action@v5
25+
continue-on-error: true
3226
with:
27+
token: ${{ secrets.CODECOV_TOKEN }} # required
3328
file: lcov.info

.github/workflows/fix_doctests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
julia-version: [1.6]
10+
julia-version: '1.10'
1111
steps:
12+
- uses: actions/checkout@v4
1213
- uses: julia-actions/setup-julia@latest
1314
with:
1415
version: ${{ matrix.julia-version }}
15-
- uses: actions/checkout@v1
1616
- name: Fix doctests
1717
shell: julia --project=docs/ {0}
1818
run: |

src/output_control.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Test.get_test_result generates code that uses the following so we must import them
22
using Test: Returned, Threw, eval_test
33

4+
@static if VERSION >= v"1.13.0-DEV.300"
5+
# https://github.com/JuliaLang/julia/commit/d934b032ea5bf63b353371ad285605128c735873
6+
# used by `Test.do_test` in `macro test_msg`
7+
using Test: eval_test_comparison, eval_test_function
8+
end
9+
410
"A cunning hack to carry extra message along with the original expression in a test"
511
struct ExprAndMsg
612
ex

0 commit comments

Comments
 (0)