Skip to content

Commit

Permalink
Merge 56e1eb3 into 0fa3f97
Browse files Browse the repository at this point in the history
  • Loading branch information
tkf committed Jan 15, 2020
2 parents 0fa3f97 + 56e1eb3 commit 19136f2
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
julia -e '
using CompatHelper;
CompatHelper.main() do;
run(`julia --project=test -e "import Pkg; Pkg.instantiate(); Pkg.update()"`);
run(`julia --project=test/environments/main -e "import Pkg; Pkg.instantiate(); Pkg.update()"`);
run(`julia --project=docs -e "import Pkg; Pkg.instantiate(); Pkg.update()"`);
end
'
2 changes: 1 addition & 1 deletion .github/workflows/pkg-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: tkf/julia-update-manifests@v1
with:
version: '1.3'
projects: test docs
projects: test/environments/main docs
- name: Update test/environments/jl10/Manifest.toml
uses: tkf/julia-update-manifests@v1
with:
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/vanilla-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Run test via Pkg.test()

on:
push:
branches:
- master
paths:
- test/environments/main/Project.toml
pull_request:
paths:
- test/environments/main/Project.toml

jobs:
vanilla-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
with:
version: 1.3
- uses: julia-actions/julia-buildpkg@latest
- uses: julia-actions/julia-runtest@latest
4 changes: 4 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ pull_request_rules:
- base=master
- "#approved-reviews-by>=1"
- status-success=Travis CI - Pull Request
- -status-failure=vanilla-test
- label=ready-to-merge:squash
- label!=work-in-progress
actions:
Expand All @@ -19,6 +20,7 @@ pull_request_rules:
- base=master
- "#approved-reviews-by>=1"
- status-success=Travis CI - Pull Request
- -status-failure=vanilla-test
- label=ready-to-merge:rebase
- label!=work-in-progress
actions:
Expand All @@ -29,6 +31,7 @@ pull_request_rules:
- base=master
- "#approved-reviews-by>=1"
- status-success=Travis CI - Pull Request
- -status-failure=vanilla-test
- label=ready-to-merge:merge
- label!=work-in-progress
actions:
Expand All @@ -39,6 +42,7 @@ pull_request_rules:
- author=tkf
- base=master
- status-success=Travis CI - Pull Request
- -status-failure=vanilla-test
- label~=ready-to-merge:.*
actions:
review: {}
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ before_install:
- unset JULIA_PROJECT
- julia -e 'using Pkg; pkg"add https://github.com/tkf/Run.jl"'
install:
- julia -e 'using Run; Run.prepare_test()'
- julia -e 'using Run; Run.prepare("test/environments/main")'
script:
- julia -e 'using Run; Run.test()'
- julia -e 'using Run; Run.test(project="test/environments/main")'
after_success:
- julia -e 'using Run; Run.after_success_test()'
jobs:
Expand Down
3 changes: 2 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ julia = "1.0"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
TransformVariables = "84d833dd-6860-57f9-a1a7-6da5db126cff"

[targets]
test = ["Aqua", "InteractiveUtils", "Test", "TransformVariables", "StaticArrays"]
test = ["Aqua", "Documenter", "InteractiveUtils", "Test", "TransformVariables", "StaticArrays"]
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ version = "0.21.0"

[[Kaleido]]
deps = ["Requires", "Setfield"]
path = ".."
path = "../../.."
uuid = "caafb194-7e8d-11e9-2724-d5981dd0806d"
version = "0.2.3-DEV"

Expand Down
File renamed without changes.

0 comments on commit 19136f2

Please sign in to comment.