diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index bd2fade61..000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,47 +0,0 @@ -branches: - only: - # This is where pull requests from "bors r+" are built. - - staging - # This is where pull requests from "bors try" are built. - - trying - # Enable building pull requests. - - master - -environment: - PYTHON: conda - matrix: - - 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 - -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%" diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml new file mode 100644 index 000000000..8ad040593 --- /dev/null +++ b/.github/workflows/Tests.yml @@ -0,0 +1,57 @@ +name: Tests + +on: + pull_request: + push: + branches: + - staging + - trying +jobs: + test: + timeout-minutes: 30 + strategy: + fail-fast: true + matrix: + - os: [ubuntu-latest, macos-latest, windows-latest] + + steps: + - name: Cancel Previous Runs + uses: styfle/cancel-workflow-action@0.4.0 + with: + access_token: ${{ github.token }} + + - name: Checkout + uses: actions/checkout@v2.2.0 + + - name: Setup Miniconda + uses: goanpeca/setup-miniconda@v1 + with: + auto-update-conda: true + python-version: 3.7 + + - name: Set up Julia + uses: julia-actions/setup-julia@v1.1.6 + with: + version: 1.4 + + - name: Install Julia Project Packages + run: | + julia --project=@. -e 'using Pkg; Pkg.instantiate()' + julia --project=@. -e 'using Pkg; Pkg.precompile()' + + - name: Run Unit Tests + run: | + julia --project=@. -e 'using Pkg; Pkg.test(coverage=true)' + + - name: Generate coverage file + run: | + julia --project=@. -e 'using Pkg; Pkg.add("Coverage"); + using Coverage; + LCOV.writefile("coverage-lcov.info", Codecov.process_folder())' + if: success() + + - name: Submit coverage + uses: codecov/codecov-action@v1.0.7 + with: + token: ${{secrets.CODECOV_TOKEN}} + if: success() diff --git a/.github/workflows/dockerci.yml b/.github/workflows/dockerci.yml deleted file mode 100644 index ba3e35b4e..000000000 --- a/.github/workflows/dockerci.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: DockerCI - -on: - push: - branches: [ master, staging, trying ] - pull_request: - branches: [ master, staging, trying ] - -jobs: - dockerci: - runs-on: ${{ matrix.os }} - strategy: - matrix: - julia-version: [1.3, 1.4] - os: [ubuntu-latest] - - steps: - - uses: actions/checkout@v2 - - name: Build and test - run: | - docker build . --file Dockerfile --tag ces:PR - docker images - docker run ces:PR - - name: "Generate coverage" - env: - JULIA_PROJECT: "@." - run: julia --project=@. -e 'using Pkg; - cd(Pkg.dir("CalibrateEmulateSample")); - Pkg.add("Coverage"); - using Coverage; - LCOV.writefile("coverage-lcov.info", Codecov.process_folder())' - if: success() - - name: "Submit coverage" - uses: codecov/codecov-action@v1.0.2 - with: - token: ${{secrets.CODECOV_TOKEN}} - if: success() - diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 534cf174e..000000000 --- a/.travis.yml +++ /dev/null @@ -1,43 +0,0 @@ -branches: - only: - # This is where pull requests from "bors r+" are built. - - staging - # This is where pull requests from "bors try" are built. - - trying - # Enable building pull requests. - - master - -## Documentation: http://docs.travis-ci.com/user/languages/julia/ -language: julia -sudo: true -dist: xenial -os: - - linux - - osx -julia: - - 1.3 - -notifications: - email: false - -after_success: - # push coverage results to Codecov - - julia -e 'import Pkg; - cd(Pkg.dir("CalibrateEmulateSample")); - Pkg.add("Coverage"); - using Coverage; - Codecov.submit(Codecov.process_folder())' - -jobs: - include: - - stage: "Documentation" - julia: 1.3 - os: linux - script: - - export DOCUMENTER_DEBUG="true" - - julia --color=yes --project=docs/ -e 'using Pkg; - Pkg.develop(PackageSpec(path=pwd())); - Pkg.instantiate(); - Pkg.build("CalibrateEmulateSample")' - - julia --color=yes --project=docs/ docs/make.jl - after_success: skip diff --git a/bors.toml b/bors.toml index c532236c1..0c5f6ac5f 100644 --- a/bors.toml +++ b/bors.toml @@ -1,6 +1,8 @@ status = [ - "dockerci (1.4, ubuntu-latest)", + "test (ubuntu-latest)', + 'test (windows-latest)', + 'test (macos-latest'), ] delete_merged_branches = true -timeout_sec = 86400 -block_labels = [ "do-not-merge-yet" ] \ No newline at end of file +timeout_sec = 3600 +block_labels = [ "do-not-merge-yet" ]