From 852447f1ac8dc49c65ceb06ac49347b3a6c9ee78 Mon Sep 17 00:00:00 2001 From: Tim Besard Date: Mon, 18 Dec 2023 16:24:15 +0100 Subject: [PATCH] Try to fix CI. --- .github/workflows/ci.yml | 18 +++++++++++------- Project.toml | 2 +- lib/GPUArraysCore/Project.toml | 2 +- lib/JLArrays/Project.toml | 2 +- test/Project.toml | 1 + test/runtests.jl | 7 ------- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 302ffee0..e0902f0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,9 @@ jobs: arch: [x64] steps: - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@latest + with: + path: "GPUArrays" + - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} @@ -33,11 +35,13 @@ jobs: ${{ runner.os }}-test-${{ env.cache-name }}- ${{ runner.os }}-test- ${{ runner.os }}- - - uses: julia-actions/julia-buildpkg@latest - - run: | - git config --global user.name Tester - git config --global user.email te@st.er - - uses: julia-actions/julia-runtest@latest + - name: Develop subpackages + run: julia --project=GPUArrays -e "using Pkg; Pkg.develop(ARGS)" GPUArraysCore JLArrays + env: + JULIA_PKG_DEVDIR: ${{ github.workspace }} + - uses: julia-actions/julia-runtest@v1 + with: + project: GPUArrays continue-on-error: ${{ matrix.version == 'nightly' }} - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v3 @@ -48,7 +52,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@latest + - uses: julia-actions/setup-julia@v1 with: version: '1.8' - name: Install dependencies diff --git a/Project.toml b/Project.toml index 6d237e3a..5870427e 100644 --- a/Project.toml +++ b/Project.toml @@ -15,7 +15,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [compat] Adapt = "4.0" -GPUArraysCore = "= 0.1.5" +GPUArraysCore = "= 0.1.6" LLVM = "3.9, 4, 5, 6" LinearAlgebra = "1" Printf = "1" diff --git a/lib/GPUArraysCore/Project.toml b/lib/GPUArraysCore/Project.toml index 6144695e..c842d718 100644 --- a/lib/GPUArraysCore/Project.toml +++ b/lib/GPUArraysCore/Project.toml @@ -1,7 +1,7 @@ name = "GPUArraysCore" uuid = "46192b85-c4d5-4398-a991-12ede77f4527" authors = ["Tim Besard "] -version = "0.1.5" +version = "0.1.6" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" diff --git a/lib/JLArrays/Project.toml b/lib/JLArrays/Project.toml index e441cb27..ea8495cb 100644 --- a/lib/JLArrays/Project.toml +++ b/lib/JLArrays/Project.toml @@ -1,7 +1,7 @@ name = "JLArrays" uuid = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb" authors = ["Tim Besard "] -version = "0.1.2" +version = "0.1.3" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" diff --git a/test/Project.toml b/test/Project.toml index f4ffcb9b..76e1e22a 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -1,5 +1,6 @@ [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" +JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" diff --git a/test/runtests.jl b/test/runtests.jl index 9c4c5dde..4df72b2b 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -3,18 +3,11 @@ using GPUArrays, Test, Pkg include("testsuite.jl") @testset "JLArray" begin - # install the JLArrays subpackage in a temporary environment - old_project = Base.active_project() - Pkg.activate(; temp=true) - Pkg.develop(path=joinpath(dirname(@__DIR__), "lib", "JLArrays")) - using JLArrays jl([1]) TestSuite.test(JLArray) - - Pkg.activate(old_project) end @testset "Array" begin