Rename platform to requires (#137)

Author: thelovekesh

.github/workflows/ci.yml

@@ -61,7 +61,7 @@ jobs:
 
   build:
     needs: prepare
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     strategy:
       matrix:
         platform: ${{fromJson(needs.prepare.outputs.platforms)}}
@@ -82,7 +82,7 @@ jobs:
         uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
 
       - name: setup buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: useblacksmith/setup-docker-builder@33fed32c1ba8775f20366ec9e8d0cd9fe8fc1dd3 # v1.3.0
 
       - name: build binaries
         uses: docker/bake-action@5be5f02ff8819ecd3092ea6b2e6261c31774f2b4 # v6.10.0
@@ -91,8 +91,6 @@ jobs:
           targets: binary-cross
           set: |
             *.platform=${{ matrix.platform }}
-            *.cache-from=type=gha,scope=binary-${{ steps.platform.outputs.pair }}
-            *.cache-to=type=gha,scope=binary-${{ steps.platform.outputs.pair }},mode=max
 
       - name: list artifacts
         run: ls -alh ./build
@@ -212,9 +210,6 @@ jobs:
             ${{ steps.meta.outputs.bake-file }}
           targets: image-cross
           push: true
-          set: |
-            *.cache-from=type=gha,scope=wpm-image
-            *.cache-to=type=gha,scope=wpm-image,mode=max
 
       - name: download artifacts
         uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 #v7.0.0

cli/command/init/init.go

@@ -522,11 +522,12 @@ func buildWPMConfig(opts initOptions, pkgType string, mainFileHeaders any, readm
 		cfg.Tags = tags
 	}
 
-	platform := &wpmjson.Platform{}
+	requires := &wpmjson.Requires{}
 	dependencies := make(wpmjson.Dependencies)
 	cfg.Team = getMetaStringSlice(readmeMeta, "contributors")
 	wpRequires := getMetaString(readmeMeta, "requires", "")
 	phpRequires := getMetaString(readmeMeta, "requires_php", "")
+	testedUpTo := getMetaString(readmeMeta, "tested", "")
 
 	switch h := mainFileHeaders.(type) {
 	case parser.ThemeFileHeaders:
@@ -654,22 +655,28 @@ func buildWPMConfig(opts initOptions, pkgType string, mainFileHeaders any, readm
 	if wpRequires != "" {
 		_, err := semver.NewConstraint(wpRequires)
 		if err == nil {
-			platform.WP = "^" + wpRequires
+			requires.WP = ">=" + wpRequires
+		}
+
+		_, err = semver.NewVersion(testedUpTo)
+		if err == nil && wpRequires != testedUpTo {
+			requires.WP += " <=" + testedUpTo
+			requires.WP = strings.TrimSpace(requires.WP)
 		}
 	}
 	if phpRequires != "" {
 		_, err := semver.NewConstraint(phpRequires)
 		if err == nil {
-			platform.PHP = "^" + phpRequires
+			requires.PHP = ">=" + phpRequires
 		}
 	}
 
 	if len(dependencies) > 0 {
 		cfg.Dependencies = &dependencies
 	}
 
-	if platform.PHP != "" || platform.WP != "" {
-		cfg.Platform = platform
+	if requires.PHP != "" || requires.WP != "" {
+		cfg.Requires = requires
 	}
 
 	return cfg

cli/command/publish/publish.go

@@ -219,7 +219,7 @@ func runPublish(ctx context.Context, wpmCli command.Cli, opts publishOptions) er
 		Description:     wpmJson.Description,
 		Type:            wpmJson.Type,
 		Version:         wpmJson.Version,
-		Platform:        wpmJson.Platform,
+		Requires:        wpmJson.Requires,
 		License:         wpmJson.License,
 		Homepage:        wpmJson.Homepage,
 		Tags:            wpmJson.Tags,

pkg/pm/wpmjson/package.go

@@ -54,8 +54,8 @@ type PackageConfig struct {
 	PlatformStrict *bool   `json:"platform-strict,omitempty"` // If set to true, wpm will refuse to install the package if the platform requirements are not met.
 }
 
-// Platform holds the php and wp version constraints for a package.
-type Platform struct {
+// Requires holds wp and php version constraints for a package
+type Requires struct {
 	WP  string `json:"wp,omitempty" validate:"omitempty,wpm_semver_constraint"`
 	PHP string `json:"php,omitempty" validate:"omitempty,wpm_semver_constraint"`
 }
@@ -69,7 +69,7 @@ type Config struct {
 	Private         bool               `json:"private,omitempty"`
 	Type            PackageType        `json:"type" validate:"required,oneof=theme plugin mu-plugin"`
 	Version         string             `json:"version" validate:"required,wpm_semver"`
-	Platform        *Platform          `json:"platform,omitempty" validate:"omitempty"`
+	Requires        *Requires          `json:"requires,omitempty" validate:"omitempty"`
 	License         string             `json:"license,omitempty" validate:"omitempty,min=3,max=100"`
 	Homepage        string             `json:"homepage,omitempty" validate:"omitempty,url,wpm_http_url,min=10,max=200"`
 	Tags            []string           `json:"tags,omitempty" validate:"omitempty,max=5,dive,min=2,max=64"`
@@ -88,7 +88,7 @@ var PackageFieldDescriptions = map[string]string{
 	"Private":         "must be a boolean. (optional)",
 	"Type":            "must be one of: 'plugin', 'theme', or 'mu-plugin'. (required)",
 	"Version":         "must be a valid semantic version (semver) and less than 64 characters. (required)",
-	"Platform":        "must be an object with 'php' and 'wp' fields, both of which must be valid semantic version constraints. (optional)",
+	"Requires":        "must be an object with 'php' and 'wp' fields, both of which must be valid semantic version constraints. (optional)",
 	"License":         "must be a string. (optional)",
 	"Homepage":        "must be a valid http url. (optional)",
 	"Tags":            "must be an array of strings with a maximum of 5 tags. (optional)",
@@ -107,7 +107,7 @@ type PackageManifest struct {
 	Description     string            `json:"description,omitempty"`
 	Type            PackageType       `json:"type"`
 	Version         string            `json:"version"`
-	Platform        *Platform         `json:"platform,omitempty"`
+	Requires        *Requires         `json:"requires,omitempty"`
 	License         string            `json:"license,omitempty"`
 	Homepage        string            `json:"homepage,omitempty"`
 	Tags            []string          `json:"tags,omitempty"`