Revert CI branch changes.

JuliaGPU · Oct 17, 2024 · 7348bba · 7348bba
1 parent 9ced4a6
commit 7348bba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -15,14 +15,13 @@ steps:
 
                 println("--- :julia: Installing TestEnv")
                 Pkg.activate(; temp=true)
-                Pkg.add(["TestEnv", "Git"])
-                using TestEnv, Git
+                Pkg.add("TestEnv")
+                using TestEnv
 
                 println("--- :julia: Installing CUDA.jl")
                 withenv("JULIA_PKG_PRECOMPILE_AUTO" => 0,
                         "JULIA_PKG_DEVDIR" => devdir) do
                   Pkg.develop("CUDA")
-                  run(setenv(`$(git()) checkout tb/gpuarrays_kernelabstractions`; dir=package))
                   Pkg.activate(package)
 
                   try
@@ -60,15 +59,14 @@ steps:
 
                 println("--- :julia: Installing TestEnv")
                 Pkg.activate(; temp=true)
-                Pkg.add(["TestEnv", "Git"])
-                using TestEnv, Git
+                Pkg.add("TestEnv")
+                using TestEnv
 
                 println("--- :julia: Installing oneAPI.jl")
                 withenv("JULIA_PKG_PRECOMPILE_AUTO" => 0,
                         "JULIA_PKG_DEVDIR" => devdir) do
                   Pkg.develop("oneAPI")
                   include(joinpath(package, "deps", "build_ci.jl"))
-                  run(setenv(`$(git()) checkout tb/gpuarrays_kernelabstractions`; dir=package))
                   Pkg.activate(package)
 
                   try
@@ -106,14 +104,13 @@ steps:
 
                 println("--- :julia: Installing TestEnv")
                 Pkg.activate(; temp=true)
-                Pkg.add(["TestEnv", "Git"])
-                using TestEnv, Git
+                Pkg.add("TestEnv")
+                using TestEnv
 
                 println("--- :julia: Installing Metal.jl")
                 withenv("JULIA_PKG_PRECOMPILE_AUTO" => 0,
                         "JULIA_PKG_DEVDIR" => devdir) do
                   Pkg.develop("Metal")
-                  run(setenv(`$(git()) checkout tb/gpuarrays_kernelabstractions`; dir=package))
                   Pkg.activate(package)
 
                   try

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,22 +61,21 @@ jobs:
 
                     println("--- :julia: Installing TestEnv")
                     Pkg.activate(; temp=true)
-                    Pkg.add(["TestEnv", "Git"])
-                    using TestEnv, Git
+                    Pkg.add("TestEnv")
+                    using TestEnv
 
                     println("--- :julia: Installing OpenCL.jl")
                     withenv("JULIA_PKG_PRECOMPILE_AUTO" => 0,
                             "JULIA_PKG_DEVDIR" => devdir) do
                       Pkg.develop("OpenCL")
-                      run(setenv(`$(git()) checkout tb/gpuarrays_kernelabstractions`; dir=package))
                       Pkg.activate(package)
 
                       try
                         Pkg.develop([PackageSpec(path=gpuarrays), PackageSpec(path=gpuarrayscore)])
                         TestEnv.activate()
                       catch err
                         @error "Could not install OpenCL.jl" exception=(err,catch_backtrace())
-                        exit(3)
+                        exit(0)
                       finally
                         Pkg.activate(package)
                       end