From 214b521c77a52d43f25aa532281ad9fb7876a904 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Sun, 29 Nov 2020 13:56:22 +0100 Subject: [PATCH 1/3] Switch to GitHub Actions based CI --- .github/workflows/ci.yml | 69 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 20 ------------ README.md | 2 +- appveyor.yml | 43 ------------------------- 4 files changed, 70 insertions(+), 64 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..101d9c9 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,69 @@ +name: CI +on: + pull_request: + branches: + - master + push: + branches: + - master + tags: '*' +jobs: + test: + name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} + runs-on: ${{ matrix.os }} + continue-on-error: ${{ matrix.version == 'nightly' }} + strategy: + fail-fast: false + matrix: + version: + - '1.0' + - '1' + - 'nightly' + os: + - ubuntu-latest + arch: + - x64 + 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 + - uses: julia-actions/julia-processcoverage@v1 + - uses: codecov/codecov-action@v1 + with: + file: lcov.info + docs: + name: Documentation + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: julia-actions/setup-julia@v1 + with: + version: '1' + - run: | + julia --project=docs -e ' + using Pkg + Pkg.develop(PackageSpec(path=pwd())) + Pkg.instantiate()' + - run: | + julia --project=docs -e ' + using Documenter: doctest + using DiffResults + doctest(DiffResults)' + - run: julia --project=docs docs/make.jl + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 63a24a5..0000000 --- a/.travis.yml +++ /dev/null @@ -1,20 +0,0 @@ -## Documentation: http://docs.travis-ci.com/user/languages/julia/ -language: julia -os: - - linux - - osx -julia: - - 1.0 - - 1.3 - - nightly -matrix: - allow_failures: - - julia: nightly -notifications: - email: false -git: - depth: 99999999 -after_success: - - julia -e 'cd(Pkg.dir("DiffResults")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' - - julia -e 'Pkg.add("Documenter")' - - julia -e 'cd(Pkg.dir("DiffResults")); include(joinpath("docs", "make.jl"))' diff --git a/README.md b/README.md index 077e80c..0b134b0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # DiffResults -[![Build Status](https://travis-ci.org/JuliaDiff/DiffResults.jl.svg?branch=master)](https://travis-ci.org/JuliaDiff/DiffResults.jl) +![CI](https://github.com/JuliaDiff/DiffResults.jl/workflows/CI/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/JuliaDiff/DiffResults.jl/badge.svg?branch=master)](https://coveralls.io/github/JuliaDiff/DiffResults.jl?branch=master) [![](https://img.shields.io/badge/docs-stable-blue.svg)](http://www.juliadiff.org/DiffResults.jl/stable) diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index f369314..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,43 +0,0 @@ -environment: - matrix: - - julia_version: 1 - - julia_version: 1.3 - - julia_version: nightly - -platform: - - x86 # 32-bit - - x64 # 64-bit - -# # Uncomment the following lines to allow failures on nightly julia -# # (tests will run but not make your overall status red) -# matrix: -# allow_failures: -# - julia_version: nightly - -branches: - only: - - master - - /release-.*/ - -notifications: - - provider: Email - on_build_success: false - on_build_failure: false - on_build_status_changed: false - -install: - - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1")) - -build_script: - - echo "%JL_BUILD_SCRIPT%" - - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%" - -test_script: - - echo "%JL_TEST_SCRIPT%" - - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%" - -# # Uncomment to support code coverage upload. Should only be enabled for packages -# # which would have coverage gaps without running on Windows -# on_success: -# - echo "%JL_CODECOV_SCRIPT%" -# - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%" \ No newline at end of file From 8ce65631f5ff3788a676c8ec3a8f25d9966086cc Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Sun, 29 Nov 2020 14:17:48 +0100 Subject: [PATCH 2/3] Add project file for docs --- docs/Project.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docs/Project.toml diff --git a/docs/Project.toml b/docs/Project.toml new file mode 100644 index 0000000..d55a82e --- /dev/null +++ b/docs/Project.toml @@ -0,0 +1,3 @@ +[deps] +DiffResults = "163ba53b-c6d8-5494-b064-1a9d43ac40c5" +Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" From 7c93b76a2a7851e5ce0e10e08fbbe7ce96c57458 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Sun, 29 Nov 2020 14:28:19 +0100 Subject: [PATCH 3/3] Fixup docs --- docs/Project.toml | 3 +++ docs/make.jl | 18 +++++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/docs/Project.toml b/docs/Project.toml index d55a82e..00e0d8d 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -1,3 +1,6 @@ [deps] DiffResults = "163ba53b-c6d8-5494-b064-1a9d43ac40c5" Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" + +[compat] +Documenter = "0.25" diff --git a/docs/make.jl b/docs/make.jl index 59c54ec..a8a8dcd 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,14 +1,10 @@ using Documenter, DiffResults -makedocs(modules=[DiffResults], - doctest = false, - format = :html, - sitename = "DiffResults", - pages = ["Documentation" => "index.md"]) +makedocs( + modules=[DiffResults], + doctest = false, + sitename = "DiffResults", + pages = ["Documentation" => "index.md"]) -deploydocs(repo = "github.com/JuliaDiff/DiffResults.jl.git", - osname = "linux", - julia = "0.6", - target = "build", - deps = nothing, - make = nothing) +deploydocs( + repo = "github.com/JuliaDiff/DiffResults.jl.git")