Skip to content

Commit

Permalink
Update CI (#24)
Browse files Browse the repository at this point in the history
* Update CI

* Update version

* Fix test
  • Loading branch information
ScottPJones committed May 19, 2021
1 parent eb3a24f commit b97c38c
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 84 deletions.
27 changes: 7 additions & 20 deletions .drone.yml
@@ -1,23 +1,10 @@
---
kind: pipeline
name: linux - arm - Julia 1.0

platform:
os: linux
arch: arm

steps:
- name: build
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)'"
name: linux - arm64 - Julia 1.5

---
kind: pipeline
name: linux - arm - Julia 1.5
platform:
os: linux
arch: arm
arch: arm64

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

---
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)'"
8 changes: 6 additions & 2 deletions .github/workflows/TagBot.yml
@@ -1,11 +1,15 @@
name: TagBot
on:
schedule:
- cron: 0 * * * *
issue_comment:
types:
- created
workflow_dispatch:
jobs:
TagBot:
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
runs-on: ubuntu-latest
steps:
- uses: JuliaRegistries/TagBot@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
ssh: ${{ secrets.DOCUMENTER_KEY }}
43 changes: 43 additions & 0 deletions .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
34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

8 changes: 4 additions & 4 deletions Project.toml
Expand Up @@ -4,7 +4,7 @@ authors = ["ScottPJones <scottjones@alum.mit.edu>"]
keywords = ["Strings", "ICU", "Encoding", "Regex"]
license = "MIT"
uuid = "124badd8-7747-5df6-9c35-5cbf8cd52816"
version = "1.0.0"
version = "1.1.0"

[deps]
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
Expand All @@ -23,6 +23,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
test = ["Test"]

[compat]
julia = "^1.0.0"
ModuleInterfaceTools = "≥ 1.0.0"
StrBase = "≥ 1.0.0"
julia = "1"
ModuleInterfaceTools = "1"
StrBase = "1"
9 changes: 3 additions & 6 deletions README.md
Expand Up @@ -11,17 +11,14 @@ Julia wrapper for the

[release]: https://img.shields.io/github/release/JuliaString/StrICU.jl.svg
[release-date]: https://img.shields.io/github/release-date/JuliaString/StrICU.jl.svg
[checks]: https://img.shields.io/github/checks-status/JuliaString/StrICU.jl/master

[license-img]: http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat
[license-url]: LICENSE.md

[gitter-img]: https://badges.gitter.im/Join%20Chat.svg
[gitter-url]: https://gitter.im/JuliaString/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge

[travis-url]: https://travis-ci.org/JuliaString/StrICU.jl
[travis-s-img]: https://travis-ci.org/JuliaString/StrICU.jl.svg
[travis-m-img]: https://travis-ci.org/JuliaString/StrICU.jl.svg?branch=master

[codecov-url]: https://codecov.io/gh/JuliaString/StrICU.jl
[codecov-img]: https://codecov.io/gh/JuliaString/StrICU.jl/branch/master/graph/badge.svg

Expand All @@ -31,8 +28,8 @@ Julia wrapper for the

| **Julia Version** | **Unit Tests** | **Coverage** |
|:------------------:|:------------------:|:---------------------:|
| [![][julia-release]][julia-url] | [![][travis-s-img]][travis-url] | [![][codecov-img]][codecov-url]
| Julia Latest | [![][travis-m-img]][travis-url] | [![][codecov-img]][codecov-url]
| [![][julia-release]][julia-url] | | [![][codecov-img]][codecov-url]
| Julia Latest | [![][checks]][pkg-url] | [![][codecov-img]][codecov-url]

This is a new wrapper for the ICU library, designed to work on Julia v0.6 and above,
using the [Strs.jl](http://github.com/JuliaString/Strs.jl) package to provide support for UTF-16 encoded strings.
Expand Down
9 changes: 0 additions & 9 deletions REQUIRE

This file was deleted.

3 changes: 2 additions & 1 deletion deps/build.jl
Expand Up @@ -2,7 +2,8 @@ using BinDeps

include("versions.jl")

@static VERSION < v"0.7.0-DEV" || (const is_windows = Sys.iswindows; const is_apple = Sys.isapple)
const is_windows = Sys.iswindows
const is_apple = Sys.isapple

@BinDeps.setup

Expand Down
4 changes: 2 additions & 2 deletions deps/versions.jl
@@ -1,2 +1,2 @@
const versions = 62:-1:52
const apt_versions = [62, 60, 58, 57, 55, 52]
const versions = 69:-1:52
const apt_versions = [69, 68, 67, 66, 65, 64, 63, 62, 60, 58, 57, 55, 52]
7 changes: 2 additions & 5 deletions src/StrICU.jl
Expand Up @@ -12,10 +12,7 @@ using ModuleInterfaceTools

@api extend! StrBase

@static if !V6_COMPAT
const is_windows = Sys.iswindows
finalizer(o, f::Function) = Base.finalizer(f, o)
end
finalizer(o, f::Function) = Base.finalizer(f, o)

import Base: parse, get, close

Expand All @@ -36,7 +33,7 @@ export set_locale!
include("../deps/deps.jl")
include("../deps/versions.jl")

@static if is_windows()
@static if Sys.iswindows()
# make sure versions match
v1 = last(matchall(r"\d{2}", iculib))
v2 = last(matchall(r"\d{2}", iculibi18n))
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Expand Up @@ -30,7 +30,7 @@ end
@testset "ubrk (Word/Line/Sentence breaking)" begin
str = ICU.cvt_utf16("This is a test of splitting sentences and words. Scott is busy.\nHow does this\nsplit? Tell me.")
for (sep, res) in ((UBRK.WORD,
[4,5,7,8,9,10,14,15,17,18,27,28,37,38,41,42,47,48,49,50,
[4,5,7,8,9,10,14,15,17,18,27,28,37,38,41,42,47,48,50,
55,56,58,59,63,64,65,68,69,73,74,78,79,84,85,86,90,91,93,94]),
(UBRK.SENTENCE, [50,65,79,86,94]),
(UBRK.LINE, [5,8,10,15,18,28,38,42,50,56,59,65,69,74,79,86,91,94]))
Expand Down

0 comments on commit b97c38c

Please sign in to comment.