diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml index 5de136389..f3d0ca8b6 100644 --- a/.github/workflows/CompatHelper.yml +++ b/.github/workflows/CompatHelper.yml @@ -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 ' diff --git a/.github/workflows/pkg-update.yml b/.github/workflows/pkg-update.yml index 934263675..c09a40840 100644 --- a/.github/workflows/pkg-update.yml +++ b/.github/workflows/pkg-update.yml @@ -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: diff --git a/.github/workflows/vanilla-test.yml b/.github/workflows/vanilla-test.yml new file mode 100644 index 000000000..8f640a89f --- /dev/null +++ b/.github/workflows/vanilla-test.yml @@ -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 diff --git a/.mergify.yml b/.mergify.yml index 2efe6cb78..f974e9bd5 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -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: @@ -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: @@ -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: @@ -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: {} diff --git a/.travis.yml b/.travis.yml index 37618f9e3..39865068e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/Project.toml b/Project.toml index 17c8cd3b9..1736ef4dd 100644 --- a/Project.toml +++ b/Project.toml @@ -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"] diff --git a/test/Manifest.toml b/test/environments/main/Manifest.toml similarity index 99% rename from test/Manifest.toml rename to test/environments/main/Manifest.toml index beddbdfef..aa0c92480 100644 --- a/test/Manifest.toml +++ b/test/environments/main/Manifest.toml @@ -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" diff --git a/test/Project.toml b/test/environments/main/Project.toml similarity index 100% rename from test/Project.toml rename to test/environments/main/Project.toml