Skip to content

Commit

Permalink
Merge pull request #12 from JuliaString/spj/update
Browse files Browse the repository at this point in the history
Use GitHub CI instead of Travis CI
  • Loading branch information
ScottPJones authored May 16, 2021
2 parents a212bdc + 02068c2 commit 799e5b8
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 43 deletions.
15 changes: 8 additions & 7 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
---
kind: pipeline
name: linux - arm - Julia 1.0
name: linux - arm64 - Julia 1.5

platform:
os: linux
arch: arm
arch: arm64

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

---
kind: pipeline
name: linux - arm64 - Julia 1.0
name: linux - arm - Julia 1.6

platform:
os: linux
arch: arm64
arch: arm

steps:
- name: build
Expand All @@ -28,14 +28,15 @@ steps:

---
kind: pipeline
name: linux - arm64 - Julia 1.5
name: linux - arm64 - Julia 1.6

platform:
os: linux
arch: arm64

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

43 changes: 43 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: CI
on:
- push
- pull_request
jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- '1.5'
- '1.6'
- 'nightly'
os:
- ubuntu-latest
- macOS-latest
- windows-latest
arch:
- x64
- x86
exclude:
- os: macOS-latest
arch: x86
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
with:
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
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["ScottPJones <[email protected]>"]
keywords = ["Entities", "HTML"]
license = "MIT"
uuid = "7693890a-d069-55fe-a829-b4a6d304f0ee"
version = "1.0.0"
version = "1.0.1"

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

[compat]
julia = "^1.0.0"
StrTables = "≥ 1.0.0"
julia = "1"
StrTables = "1"
11 changes: 5 additions & 6 deletions deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ include(inpname)
const disp = [false]

const fname = "html.dat"
const datapath = "../data"
const datapath = joinpath(@__DIR__, "..", "data")

const empty_str = ""

Expand Down Expand Up @@ -89,14 +89,13 @@ if isfile(savfile)
println("Tables already exist")
else
println("Creating tables")
tup = nothing
try
global tup
tup = make_tables()
println("Saving tables to ", savfile)
StrTables.save(savfile, tup)
println("Done")
catch ex
println("Error creating HTML tables")
println(sprint(showerror, ex, catch_backtrace()))
end
println("Saving tables to ", savfile)
StrTables.save(savfile, tup)
println("Done")
end

0 comments on commit 799e5b8

Please sign in to comment.