Added multi-arch support to build scripts

.gitignore

@@ -5,4 +5,4 @@
 /bin
 /linux
 /darwin
-/windows
+/windows

README.md

@@ -46,14 +46,16 @@ file that looks like the following:
     launch = true
 ```
 
-## Usage
+## Packaging
 
 To package this buildpack for consumption:
 
-```shell
-$ ./scripts/package.sh --version <version-number>
+```bash
+./scripts/package.sh --version 2.2.6
 ```
 
+This will build the buildpack for all target architectures specified in `buildpack.toml` (amd64 and arm64 by default) and create a single archive containing binaries for all architectures in the `build/` directory.
+
 This will create a `buildpackage.cnb` file under the `build` directory which you
 can use to build your app as follows:
 ```shell
@@ -66,6 +68,29 @@ pack build <app-name> \
 
 Though the API of this buildpack does not require `node`, yarn is unusable without node.
 
+## Publishing
+
+To publish this buildpack to ECR:
+
+```bash
+# First, authenticate with ECR (if not already authenticated)
+aws ecr get-login-password --region us-east-1 | \
+  docker login --username AWS --password-stdin 348674388966.dkr.ecr.us-east-1.amazonaws.com
+
+# Then publish the buildpack
+./scripts/publish.sh \
+  --image-ref 348674388966.dkr.ecr.us-east-1.amazonaws.com/neeto-deploy/paketo/buildpack/yarn:<version> \
+  --buildpack-type buildpack
+```
+
+The script will automatically:
+- Read target architectures from `buildpack.toml`
+- Extract the buildpack archive
+- Publish each architecture separately with arch-suffixed tags (e.g., `yarn:<version>-amd64`, `yarn:<version>-arm64`)
+- Create and push a multi-arch manifest list
+
+## Usage
+
 ## Run Tests
 
 To run all unit tests, run:

build.go

@@ -1,21 +1,21 @@
 package yarn
 
 import (
-    "fmt"
-    "os"
-    "os/exec"
-    "path/filepath"
-    "strconv"
-    "strings"
-    "time"
-    "encoding/json"
-
-    "github.com/paketo-buildpacks/packit/v2"
-    "github.com/paketo-buildpacks/packit/v2/chronos"
-    "github.com/paketo-buildpacks/packit/v2/draft"
-    "github.com/paketo-buildpacks/packit/v2/postal"
-    "github.com/paketo-buildpacks/packit/v2/sbom"
-    "github.com/paketo-buildpacks/packit/v2/scribe"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+	"encoding/json"
+
+	"github.com/paketo-buildpacks/packit/v2"
+	"github.com/paketo-buildpacks/packit/v2/chronos"
+	"github.com/paketo-buildpacks/packit/v2/draft"
+	"github.com/paketo-buildpacks/packit/v2/postal"
+	"github.com/paketo-buildpacks/packit/v2/sbom"
+	"github.com/paketo-buildpacks/packit/v2/scribe"
 )
 
 //go:generate faux --interface DependencyManager --output fakes/dependency_manager.go
@@ -51,31 +51,31 @@ func Build(
             version = "default"
         }
 
-        // Detect Yarn Berry (modern) by presence of .yarnrc.yml/.yarnrc.yaml
-        isBerryYarn := false
-        if _, statErr := os.Stat(filepath.Join(context.WorkingDir, ".yarnrc.yml")); statErr == nil {
-            isBerryYarn = true
-        } else if _, statErr := os.Stat(filepath.Join(context.WorkingDir, ".yarnrc.yaml")); statErr == nil {
-            isBerryYarn = true
-        }
+		// Detect Yarn Berry (modern) by presence of .yarnrc.yml/.yarnrc.yaml
+		isBerryYarn := false
+		if _, statErr := os.Stat(filepath.Join(context.WorkingDir, ".yarnrc.yml")); statErr == nil {
+			isBerryYarn = true
+		} else if _, statErr := os.Stat(filepath.Join(context.WorkingDir, ".yarnrc.yaml")); statErr == nil {
+			isBerryYarn = true
+		}
 
-        // If package.json declares packageManager: "yarn@<ver>", prefer that ONLY for Berry projects
-        var pmYarnVersion string
-        if data, readErr := os.ReadFile(filepath.Join(context.WorkingDir, "package.json")); readErr == nil {
-            var pkg struct {
-                PackageManager string `json:"packageManager"`
-            }
-            if jsonErr := json.Unmarshal(data, &pkg); jsonErr == nil {
-                pm := strings.TrimSpace(pkg.PackageManager)
-                if strings.HasPrefix(pm, "yarn@") {
-                    v := strings.TrimPrefix(pm, "yarn@")
-                    if idx := strings.IndexAny(v, " +#"); idx != -1 {
-                        v = v[:idx]
-                    }
-                    pmYarnVersion = v
-                }
-            }
-        }
+		// If package.json declares packageManager: "yarn@<ver>", prefer that ONLY for Berry projects
+		var pmYarnVersion string
+		if data, readErr := os.ReadFile(filepath.Join(context.WorkingDir, "package.json")); readErr == nil {
+			var pkg struct {
+				PackageManager string `json:"packageManager"`
+			}
+			if jsonErr := json.Unmarshal(data, &pkg); jsonErr == nil {
+				pm := strings.TrimSpace(pkg.PackageManager)
+				if strings.HasPrefix(pm, "yarn@") {
+					v := strings.TrimPrefix(pm, "yarn@")
+					if idx := strings.IndexAny(v, " +#"); idx != -1 {
+						v = v[:idx]
+					}
+					pmYarnVersion = v
+				}
+			}
+		}
 		dependency, err := dependencyManager.Resolve(
 			filepath.Join(context.CNBPath, "buildpack.toml"),
 			entry.Name,
@@ -99,15 +99,21 @@ func Build(
 			launchMetadata = packit.LaunchMetadata{BOM: bom}
 		}
 
-        // Use resolved dependency version as the install version (override with packageManager only for Berry)
-		
-        resolvedInstallVersion := dependency.Version
-        if isBerryYarn && pmYarnVersion != "" {
-            resolvedInstallVersion = pmYarnVersion
-        }
+		// Use resolved dependency version as the install version (override with packageManager only for Berry)
+
+		resolvedInstallVersion := dependency.Version
+		if isBerryYarn && pmYarnVersion != "" {
+			resolvedInstallVersion = pmYarnVersion
+		}
 
-        cachedSHA, ok := yarnLayer.Metadata[DependencyCacheKey].(string)
-        if ok && !isBerryYarn && postal.Checksum(dependency.Checksum).MatchString(cachedSHA) {
+		// Yarn 4+ (Berry) is shipped via Corepack, not a tarball with a bin/.
+		// Treat any 4.x request as Berry even if no .yarnrc.yml is present (e.g. classic-style projects requesting 4.x).
+		if strings.HasPrefix(resolvedInstallVersion, "4.") {
+			isBerryYarn = true
+		}
+
+		cachedSHA, ok := yarnLayer.Metadata[DependencyCacheKey].(string)
+		if ok && !isBerryYarn && postal.Checksum(dependency.Checksum).MatchString(cachedSHA) {
 			logger.Process("Reusing cached layer %s", yarnLayer.Path)
 			logger.Break()
 
@@ -120,63 +126,67 @@ func Build(
 			}, nil
 		}
 
-        logger.Process("Executing build process")
+		logger.Process("Executing build process")
 
 		yarnLayer, err = yarnLayer.Reset()
 		if err != nil {
 			return packit.BuildResult{}, err
 		}
 
-        yarnLayer.Launch, yarnLayer.Build, yarnLayer.Cache = launch, build, build
-
-        logger.Subprocess("Installing Yarn %s", resolvedInstallVersion)
-
-        var duration time.Duration
-        if isBerryYarn {
-            // Persist Corepack cache under the yarn layer so the runtime doesn't re-download Yarn
-            corepackDir := filepath.Join(yarnLayer.Path, "corepack")
-            if mkErr := os.MkdirAll(corepackDir, 0o755); mkErr != nil {
-                return packit.BuildResult{}, mkErr
-            }
-
-
-            duration, err = clock.Measure(func() error {
-                steps := [][]string{
-                    {"corepack", "enable"},
-                    {"corepack", "prepare", fmt.Sprintf("yarn@%s", resolvedInstallVersion), "--activate"},
-                }
-                for _, args := range steps {
-
-                    cmd := exec.Command(args[0], args[1:]...)
-                    cmd.Env = append(os.Environ(), "COREPACK_HOME="+corepackDir)
-                    cmd.Stdout = os.Stdout
-                    cmd.Stderr = os.Stderr
-                    if err := cmd.Run(); err != nil {
-                        return err
-                    }
-                }
-                return nil
-            })
-            if err != nil {
-                return packit.BuildResult{}, err
-            }
-            logger.Action("Completed in %s", duration.Round(time.Millisecond))
-            logger.Break()
-            // Ensure COREPACK_HOME is present in build and launch images
-            yarnLayer.Build = true
-            yarnLayer.Launch = true
-            yarnLayer.BuildEnv.Default("COREPACK_HOME", filepath.Join(yarnLayer.Path, "corepack"))
-            yarnLayer.LaunchEnv.Default("COREPACK_HOME", filepath.Join(yarnLayer.Path, "corepack"))
-        } else {
-            duration, err = clock.Measure(func() error {
-                return dependencyManager.Deliver(dependency, context.CNBPath, yarnLayer.Path, context.Platform.Path)
-            })
-            if err != nil {
-                return packit.BuildResult{}, err
-            }
-            logger.Action("Completed in %s", duration.Round(time.Millisecond))
-            logger.Break()
-        }
+		yarnLayer.Launch, yarnLayer.Build, yarnLayer.Cache = launch, build, build
+
+		logger.Subprocess("Installing Yarn %s", resolvedInstallVersion)
+
+		var duration time.Duration
+		if isBerryYarn {
+			// Persist Corepack cache under the yarn layer so the runtime doesn't re-download Yarn
+			corepackDir := filepath.Join(yarnLayer.Path, "corepack")
+			if mkErr := os.MkdirAll(corepackDir, 0o755); mkErr != nil {
+				return packit.BuildResult{}, mkErr
+			}
+
+			duration, err = clock.Measure(func() error {
+				steps := [][]string{
+					{"corepack", "enable"},
+					{"corepack", "prepare", fmt.Sprintf("yarn@%s", resolvedInstallVersion), "--activate"},
+				}
+				for _, args := range steps {
+
+					cmd := exec.Command(args[0], args[1:]...)
+					cmd.Env = append(os.Environ(), "COREPACK_HOME="+corepackDir)
+					cmd.Stdout = os.Stdout
+					cmd.Stderr = os.Stderr
+					if err := cmd.Run(); err != nil {
+						return err
+					}
+				}
+				return nil
+			})
+			if err != nil {
+				return packit.BuildResult{}, err
+			}
+			logger.Action("Completed in %s", duration.Round(time.Millisecond))
+			logger.Break()
+			// Ensure COREPACK_HOME is present in build and launch images
+			yarnLayer.Build = true
+			yarnLayer.Launch = true
+			corepackHome := filepath.Join(yarnLayer.Path, "corepack")
+			yarnLayer.BuildEnv.Default("COREPACK_HOME", corepackHome)
+			yarnLayer.LaunchEnv.Default("COREPACK_HOME", corepackHome)
+			// Corepack writes the yarn shim into COREPACK_HOME/shims; expose that on PATH.
+			shimsDir := filepath.Join(corepackHome, "shims")
+			yarnLayer.BuildEnv.Append("PATH", shimsDir, string(os.PathListSeparator))
+			yarnLayer.LaunchEnv.Append("PATH", shimsDir, string(os.PathListSeparator))
+		} else {
+			duration, err = clock.Measure(func() error {
+				return dependencyManager.Deliver(dependency, context.CNBPath, yarnLayer.Path, context.Platform.Path)
+			})
+			if err != nil {
+				return packit.BuildResult{}, err
+			}
+			logger.Action("Completed in %s", duration.Round(time.Millisecond))
+			logger.Break()
+		}
 
 		sbomDisabled, err := checkSbomDisabled()
 		if err != nil {
@@ -207,13 +217,13 @@ func Build(
 			}
 		}
 
-        cacheValue := dependency.Checksum
-        if isBerryYarn || cacheValue == "" {
-            cacheValue = dependency.Version
-        }
-        yarnLayer.Metadata = map[string]interface{}{
-            DependencyCacheKey: cacheValue,
-        }
+		cacheValue := dependency.Checksum
+		if isBerryYarn || cacheValue == "" {
+			cacheValue = dependency.Version
+		}
+		yarnLayer.Metadata = map[string]interface{}{
+			DependencyCacheKey: cacheValue,
+		}
 
 		return packit.BuildResult{
 			Layers: []packit.Layer{yarnLayer},

buildpack.toml

@@ -5,6 +5,7 @@ api = "0.7"
   id = "neeto-deploy/yarn"
   name = "Paketo Buildpack for Yarn"
   sbom-formats = ["application/vnd.cyclonedx+json", "application/spdx+json", "application/vnd.syft+json"]
+  version = "2.2.6"
 
   [[buildpack.licenses]]
     type = "Apache-2.0"
@@ -21,7 +22,7 @@ api = "0.7"
     "linux/arm64/bin/run",
   ]
 
-  pre-package = "./scripts/build.sh --target linux/amd64 --target linux/arm64"
+  pre-package = "./scripts/build.sh"
 
   [metadata.default_versions]
     yarn = "1.*"
@@ -40,19 +41,19 @@ api = "0.7"
     version = "1.22.19"
 
   [[metadata.dependencies]]
-    checksum = "sha256:c8d3eae160a892e32837db3dcae515e843e5383fef52b8141940c8bcf8b6d59f"
+    checksum = "sha256:75fd1c08678a187eb29b589109d90a30cdb98ffbcb80b81cf65faa2b2f71c94e"
     cpe = "cpe:2.3:a:yarnpkg:yarn:4.9.2:*:*:*:*:*:*:*"
     id = "yarn"
     licenses = ["BSD-2-Clause"]
     name = "Yarn"
     purl = "pkg:generic/yarn@4.9.2"
-    source = "https://registry.npmjs.org/yarn/-/yarn-4.9.2.tgz"
-    source-checksum = "sha256:c8d3eae160a892e32837db3dcae515e843e5383fef52b8141940c8bcf8b6d59f"
+    source = "https://registry.npmjs.org/@yarnpkg/cli/-/cli-4.9.2.tgz"
+    source-checksum = "sha256:75fd1c08678a187eb29b589109d90a30cdb98ffbcb80b81cf65faa2b2f71c94e"
     stacks = ["io.buildpacks.stacks.bionic", "io.buildpacks.stacks.jammy", "io.buildpacks.stacks.noble", "*"]
     strip-components = 1
-    uri = "https://registry.npmjs.org/yarn/-/yarn-4.9.2.tgz"
+    uri = "https://paketo-artifacts.s3.us-east-1.amazonaws.com/yarn/yarn-4.9.2.tgz"
     version = "4.9.2"
-    
+
   [[metadata.dependencies]]
     checksum = "sha256:88268464199d1611fcf73ce9c0a6c4d44c7d5363682720d8506f6508addf36a0"
     cpe = "cpe:2.3:a:yarnpkg:yarn:1.22.22:*:*:*:*:*:*:*"