Skip to content

Commit 799e5b8

Browse files
authored
Merge pull request #12 from JuliaString/spj/update
Use GitHub CI instead of Travis CI
2 parents a212bdc + 02068c2 commit 799e5b8

File tree

5 files changed

+59
-43
lines changed

5 files changed

+59
-43
lines changed

.drone.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
---
22
kind: pipeline
3-
name: linux - arm - Julia 1.0
3+
name: linux - arm64 - Julia 1.5
44

55
platform:
66
os: linux
7-
arch: arm
7+
arch: arm64
88

99
steps:
1010
- name: build
11-
image: julia:1.0
11+
image: julia:1.5
1212
commands:
1313
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
1414

1515
---
1616
kind: pipeline
17-
name: linux - arm64 - Julia 1.0
17+
name: linux - arm - Julia 1.6
1818

1919
platform:
2020
os: linux
21-
arch: arm64
21+
arch: arm
2222

2323
steps:
2424
- name: build
@@ -28,14 +28,15 @@ steps:
2828

2929
---
3030
kind: pipeline
31-
name: linux - arm64 - Julia 1.5
31+
name: linux - arm64 - Julia 1.6
3232

3333
platform:
3434
os: linux
3535
arch: arm64
3636

3737
steps:
3838
- name: build
39-
image: julia:1.5
39+
image: julia:1.0
4040
commands:
4141
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
42+

.github/workflows/ci.yml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: CI
2+
on:
3+
- push
4+
- pull_request
5+
jobs:
6+
test:
7+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
8+
runs-on: ${{ matrix.os }}
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
version:
13+
- '1.5'
14+
- '1.6'
15+
- 'nightly'
16+
os:
17+
- ubuntu-latest
18+
- macOS-latest
19+
- windows-latest
20+
arch:
21+
- x64
22+
- x86
23+
exclude:
24+
- os: macOS-latest
25+
arch: x86
26+
steps:
27+
- uses: actions/checkout@v2
28+
- uses: julia-actions/setup-julia@v1
29+
with:
30+
version: ${{ matrix.version }}
31+
arch: ${{ matrix.arch }}
32+
- uses: actions/cache@v1
33+
env:
34+
cache-name: cache-artifacts
35+
with:
36+
path: ~/.julia/artifacts
37+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
38+
restore-keys: |
39+
${{ runner.os }}-test-${{ env.cache-name }}-
40+
${{ runner.os }}-test-
41+
${{ runner.os }}-
42+
- uses: julia-actions/julia-buildpkg@v1
43+
- uses: julia-actions/julia-runtest@v1

.travis.yml

-27
This file was deleted.

Project.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ authors = ["ScottPJones <[email protected]>"]
44
keywords = ["Entities", "HTML"]
55
license = "MIT"
66
uuid = "7693890a-d069-55fe-a829-b4a6d304f0ee"
7-
version = "1.0.0"
7+
version = "1.0.1"
88

99
[deps]
1010
StrTables = "9700d1a9-a7c8-5760-9816-a99fda30bb8f"
@@ -16,5 +16,5 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1616
test = ["Test"]
1717

1818
[compat]
19-
julia = "^1.0.0"
20-
StrTables = "≥ 1.0.0"
19+
julia = "1"
20+
StrTables = "1"

deps/build.jl

+5-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include(inpname)
1515
const disp = [false]
1616

1717
const fname = "html.dat"
18-
const datapath = "../data"
18+
const datapath = joinpath(@__DIR__, "..", "data")
1919

2020
const empty_str = ""
2121

@@ -89,14 +89,13 @@ if isfile(savfile)
8989
println("Tables already exist")
9090
else
9191
println("Creating tables")
92-
tup = nothing
9392
try
94-
global tup
9593
tup = make_tables()
94+
println("Saving tables to ", savfile)
95+
StrTables.save(savfile, tup)
96+
println("Done")
9697
catch ex
98+
println("Error creating HTML tables")
9799
println(sprint(showerror, ex, catch_backtrace()))
98100
end
99-
println("Saving tables to ", savfile)
100-
StrTables.save(savfile, tup)
101-
println("Done")
102101
end

0 commit comments

Comments
 (0)