From 29ed385d498a70b8d41da9d88a366707c7263388 Mon Sep 17 00:00:00 2001
From: William Moses <gh@wsmoses.com>
Date: Sat, 21 Sep 2024 15:38:09 -0500
Subject: [PATCH] Try fixing buildkite (#1843)

* Try fixing buildkite

* Update pipeline.yml

* Update pipeline.yml

* Update pipeline.yml
---
 .buildkite/pipeline.yml | 67 ++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6de936a558..1a9f70d04c 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -15,10 +15,10 @@ steps:
     commands: |
       echo "--- Setup Julia packages"
       julia --color=yes -e '
-          import Pkg
-          Pkg.develop(; path = pwd())
-          Pkg.develop(; path = joinpath(pwd(), "lib", "EnzymeCore"))
-          Pkg.develop(; name = "CUDA")' || exit 3
+          using Pkg
+          pkgs = [PackageSpec(; path) for path in (".", "lib/EnzymeCore", "lib/EnzymeTestUtils")]
+          push!(pkgs, PackageSpec(; name="CUDA"))
+          Pkg.develop(pkgs)' || exit 3
 
       echo "+++ Run tests"
       julia --color=yes test/cuda.jl
@@ -41,40 +41,39 @@ steps:
     commands: |
       echo "--- Setup Julia packages"
       julia --color=yes -e '
-          import Pkg
-          Pkg.develop(; path = pwd())
-          Pkg.develop(; path = joinpath(pwd(), "lib", "EnzymeCore"))
-          Pkg.develop(; name = "AMDGPU")' || exit 3
+          using Pkg
+          pkgs = [PackageSpec(; path) for path in (".", "lib/EnzymeCore", "lib/EnzymeTestUtils")]
+          push!(pkgs, PackageSpec(; name="AMDGPU"))
+          Pkg.develop(pkgs)' || exit 3
 
       echo "+++ Run tests"
       julia --color=yes test/amdgpu.jl
     env:
       JULIA_PKG_SERVER_REGISTRY_PREFERENCE: eager
 
-  # - label: "Metal Julia v{{matrix.version}}"
-  #   matrix:
-  #     setup:
-  #       version:
-  #         - "1.8"
-  #         - "1.9"
-  #   plugins:
-  #     - JuliaCI/julia#v1:
-  #         version: "{{matrix.version}}"
-  #   agents:
-  #     queue: "juliaecosystem"
-  #     os: "macos"
-  #     arch: "aarch64"
-  #   if: build.message !~ /\[skip tests\]/
-  #   timeout_in_minutes: 60
-  #   commands: |
-  #     echo "--- Setup Julia packages"
-  #     julia --color=yes -e '
-  #         import Pkg
-  #         Pkg.develop(; path = pwd())
-  #         Pkg.develop(; path = joinpath(pwd(), "lib", "EnzymeCore"))
-  #         Pkg.develop(; name = "Metal")' || exit 3
+  - label: "Metal Julia v{{matrix.version}}"
+    matrix:
+      setup:
+        version:
+          - "1.10"
+    plugins:
+      - JuliaCI/julia#v1:
+          version: "{{matrix.version}}"
+    agents:
+      queue: "juliaecosystem"
+      os: "macos"
+      arch: "aarch64"
+    if: build.message !~ /\[skip tests\]/
+    timeout_in_minutes: 60
+    commands: |
+      echo "--- Setup Julia packages"
+      julia --color=yes -e '
+          using Pkg
+          pkgs = [PackageSpec(; path) for path in (".", "lib/EnzymeCore", "lib/EnzymeTestUtils")]
+          push!(pkgs, PackageSpec(; name="Metal"))
+          Pkg.develop(pkgs)' || exit 3
 
-  #     echo "+++ Run tests"
-  #     julia --color=yes test/metal.jl
-  #   env:
-  #     JULIA_PKG_SERVER_REGISTRY_PREFERENCE: eager
+      echo "+++ Run tests"
+      julia --color=yes test/metal.jl
+    env:
+      JULIA_PKG_SERVER_REGISTRY_PREFERENCE: eager