Merge pull request #22 from JuliaString/spj/update

Update CI

Author: ScottPJones

.drone.yml

@@ -1,41 +1,41 @@
 ---
 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
-  image: julia:1.0
+  image: julia:1.6
   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.5
+name: linux - arm64 - Julia 1.6
 
 platform:
   os: linux
   arch: arm64
 
 steps:
 - name: build
-  image: julia:1.5
+  image: julia:1.6
   commands:
   - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"

.github/workflows/ci.yml

@@ -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

.travis.yml

@@ -4,7 +4,7 @@ keywords = ["Entities", "Unicode"]
 license = "MIT"
 name = "Unicode_Entities"
 uuid = "a8aa15d3-c567-5e9f-b6cc-4b0f97f09cf7"
-version = "1.1.0"
+version = "1.1.1"
 
 [deps]
 StrTables = "9700d1a9-a7c8-5760-9816-a99fda30bb8f"

Project.toml

@@ -4,7 +4,7 @@ using StrTables
 
 const VER = UInt32(1)
 
-const datapath = "../data"
+const datapath = joinpath(@__DIR__, "..", "data")
 const dpath = "https://www.unicode.org/Public/UCD/latest/ucd/"
 const inpname = "UnicodeData.txt"
 const fname = "unicode.dat"
@@ -48,10 +48,15 @@ function load_unicode_data(datapath, dpath, fname)
         println("Loading Unicode Data: ", lname)
         src = lname
     else
-        src = string(dpath, fname)
-        println("Downloading Unicode Data: ", src)
-        download(src, lname)
-        println("Saved to: ", lname)
+        try
+            src = string(dpath, fname)
+            println("Downloading Unicode Data: ", src)
+            download(src, lname)
+            println("Saved to: ", lname)
+        catch ex
+            println("Unable to download $src and save in $lname")
+            rethrow(ex)
+        end
     end
     symnam = String[]
     symval = UInt32[]
@@ -280,10 +285,10 @@ else
     try
         global tup
         tup = make_tables(datapath, dpath, inpname)
+        println("Saving tables to ", savfile)
+        StrTables.save(savfile, tup)
+        println("Done")
     catch ex
         println(sprint(showerror, ex, catch_backtrace()))
     end
-    println("Saving tables to ", savfile)
-    StrTables.save(savfile, tup)
-    println("Done")
 end

deps/build.jl

@@ -1,13 +1,13 @@
 using StrTables, Unicode_Entities
 
-@static VERSION < v"0.7.0-DEV" ? (using Base.Test) : (using Test)
+using Test
 
 # Test the functions lookupname, matches, longestmatches, completions
 # Check that characters from all 3 tables (BMP, non-BMP, 2 character) are tested
 
 const def = Unicode_Entities.default
 
-const datapath = "../data"
+const datapath = joinpath(pathof(Unicode_Entities), "data")
 const dpath = "ftp://ftp.unicode.org/Public/UNIDATA/"
 const fname = "UnicodeData.txt"
 
@@ -17,7 +17,15 @@ const symval = Vector{Char}()
 """Load up all names and characters from original data file"""
 function load_unicode_data()
     lname = joinpath(datapath, fname)
-    isfile(lname) || download(string(dpath, fname), lname)
+    if !isfile(lname)
+        try
+            lname = download(string(dpath, fname), lname)
+        catch ex
+            println("Error loading \"$(string(dpath, fname))\" and saving in \"$lname\"")
+            println(sprint(showerror, ex, catch_backtrace()))
+            return false
+        end
+    end
     aliasnam = Vector{String}()
     aliasval = Vector{Char}()
     open(lname, "r") do f
@@ -48,13 +56,11 @@ function load_unicode_data()
             push!(symval, ch)
         end
     end
+    true
 end
 
-load_unicode_data()
-
 @testset "Unicode_Entities" begin
-
-    @testset "matches data file" begin
+if load_unicode_data() @testset "matches data file" begin
         for (i, ch) in enumerate(symval)
             list = matchchar(def, ch)
             if !isempty(list)
@@ -68,6 +74,7 @@ load_unicode_data()
             end
         end
     end
+end
 
 @testset "lookupname" begin
     @test lookupname(def, "foobar")   == ""