From ededb3f13b54946b68371e5ebbd0d02fedd007ba Mon Sep 17 00:00:00 2001 From: Robin Deits Date: Sat, 19 Dec 2020 18:37:27 -0500 Subject: [PATCH 1/5] try switching to github CI --- .github/workflows/ci.yml | 39 +++++++++++++++++++++++++++++++++ .travis.yml | 47 ---------------------------------------- appveyor.yml | 44 ------------------------------------- 3 files changed, 39 insertions(+), 91 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..9651f6b --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,39 @@ +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.3' + - '1.5' + - 'nightly' + os: + - ubuntu-latest + - macOS-latest + - windows-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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ff24a68..0000000 --- a/.travis.yml +++ /dev/null @@ -1,47 +0,0 @@ -## Documentation: http://docs.travis-ci.com/user/languages/julia/ -language: julia -jobs: - include: - - os: linux - julia: 1.3 - env: TESTCMD="xvfb-run julia" - - os: linux - julia: 1.4 - env: TESTCMD="xvfb-run julia" - - os: linux - julia: 1.5 - env: TESTCMD="xvfb-run julia" - - os: linux - julia: nightly - env: TESTCMD="xvfb-run julia" - - os: osx - julia: 1.5 - env: TESTCMD="julia" - - os: osx - julia: nightly - env: TESTCMD="julia" - - stage: "Documentation" - julia: 1.5 - os: linux - script: - - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); - Pkg.instantiate(); Pkg.build()' - - julia --project=docs/ docs/make.jl - after_success: skip - allow_failures: - - julia: nightly - -notifications: - email: false - -branches: - only: - - master - -script: - - julia --color=yes -e "using Pkg; Pkg.build(verbose=true)" - - $TESTCMD --check-bounds=yes --color=yes -e 'using Pkg; Pkg.test("MeshCat", coverage=true)' - - julia --color=yes -e 'using MeshCat; MeshCat.develop_meshcat_assets(true)' - - julia --color=yes -e 'import Pkg; Pkg.build("MeshCat")' -after_success: - - julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())' diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 02c93c2..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,44 +0,0 @@ -environment: - matrix: - - julia_version: 1.3 - - julia_version: 1.4 - - julia_version: 1.5 - - 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 f9e0dbe3daf19080f351a4e6666958a8cd82efe4 Mon Sep 17 00:00:00 2001 From: Robin Deits Date: Sat, 19 Dec 2020 18:45:12 -0500 Subject: [PATCH 2/5] set the CI env var --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9651f6b..c275af6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,7 @@ jobs: - uses: actions/cache@v1 env: cache-name: cache-artifacts + CI: true with: path: ~/.julia/artifacts key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }} From 03d069bc344d257117c47804eda6643c30d7e41e Mon Sep 17 00:00:00 2001 From: Robin Deits Date: Sat, 19 Dec 2020 19:04:53 -0500 Subject: [PATCH 3/5] try to set up xvfb prefix --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c275af6..e067a6d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,10 @@ jobs: - windows-latest arch: - x64 + include: + - os: ubuntu-latest + prefix: xvfb-run + steps: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 @@ -38,3 +42,5 @@ jobs: ${{ runner.os }}- - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 + with: + prefix: ${{ matrix.prefix }} From 498bab4a86474d67cb2d7003509c1b37e862f147 Mon Sep 17 00:00:00 2001 From: Robin Deits Date: Sat, 19 Dec 2020 19:17:58 -0500 Subject: [PATCH 4/5] fix use of RotZ(pi) on Julia-1.3 --- test/scenes.jl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/scenes.jl b/test/scenes.jl index 65a4945..91626b5 100644 --- a/test/scenes.jl +++ b/test/scenes.jl @@ -14,7 +14,9 @@ using CoordinateTransformations for x in range(-5, stop=5, step=2) for y in range(-5, stop=5, step=2) setobject!(vis["cat"][string(x)][string(y)], cat) - settransform!(vis["cat"][string(x)][string(y)], Translation(x, y, 0) ∘ LinearMap(RotZ(π)) ∘ LinearMap(RotX(π/2))) + settransform!(vis["cat"][string(x)][string(y)], + Translation(x, y, 0) ∘ + LinearMap(RotZ(Float64(π))) ∘ LinearMap(RotX(π/2))) end end end From acd91998e6a77c918c59272e3c4748e3cb0d5f13 Mon Sep 17 00:00:00 2001 From: Robin Deits Date: Sat, 19 Dec 2020 19:29:14 -0500 Subject: [PATCH 5/5] more pi fixes --- test/visualizer.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/visualizer.jl b/test/visualizer.jl index b8ed056..085d737 100644 --- a/test/visualizer.jl +++ b/test/visualizer.jl @@ -96,7 +96,7 @@ end @testset "cat" begin mesh = load(cat_mesh_path) setobject!(v[:cat], mesh) - settransform!(v[:cat], Translation(0, -1, 0) ∘ LinearMap(RotZ(π)) ∘ LinearMap(RotX(π/2))) + settransform!(v[:cat], Translation(0, -1, 0) ∘ LinearMap(RotZ(Float64(π))) ∘ LinearMap(RotX(π/2))) end @testset "cat_color" begin @@ -104,7 +104,7 @@ end color = RGBA{Float32}(0.5, 0.5, 0.5, 0.5) setobject!(v[:cat_color], mesh, MeshLambertMaterial(color=color)) - settransform!(v[:cat_color], Translation(0, -2.0, 0) ∘ LinearMap(RotZ(π)) ∘ LinearMap(RotX(π/2))) + settransform!(v[:cat_color], Translation(0, -2.0, 0) ∘ LinearMap(RotZ(Float64(π))) ∘ LinearMap(RotX(π/2))) end @testset "mesh file geometries" begin