Update library version and fix revision usage in cache samples (#188)

* Feature/update gh actions (#4) * Update gh actions for nodejs16 Signed-off-by: thepetk <[email protected]> * Further updates on gh actions versions Signe-off-by: thepetk <[email protected]> Signed-off-by: thepetk <[email protected]> --------- Signed-off-by: thepetk <[email protected]> * Update devfile library version on server and generator Signed-off-by: thepetk <[email protected]> * Update vendor Signed-off-by: thepetk <[email protected]> * Update vendor for generator Signed-off-by: thepetk <[email protected]> * Use git.revision instead of git.checktoutFrom Signed-off-by: thepetk <[email protected]> * Fix test raw parent devfile url Signed-off-by: thepetk <[email protected]> --------- Signed-off-by: thepetk <[email protected]>
devfile · Nov 2, 2023 · b5f8893 · b5f8893
1 parent 1168591
commit b5f8893
Show file tree

Hide file tree

Showing 150 changed files with 6,406 additions and 538 deletions.
diff --git a/build-tools/cache_samples.sh b/build-tools/cache_samples.sh
@@ -48,11 +48,11 @@ function cache_sample() {
 
     # Git clone the sample project
     gitRepository="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.git.remotes.origin)' -)"
-    revision="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.git.checkoutFrom.revision)' -)"
+    revision="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.git.revision)' -)"
     if [[ $gitRepository == "null" ]]; then
         for version in $(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.versions[].version)' -); do
           gitRepository="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.versions[] | select(.version == "'${version}'")' -| yq e '.git.remotes.origin' -)"
-          revision="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.versions[] | select(.version == "'${version}'")' -| yq e '.git.checkoutFrom.revision' -)"
+          revision="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.versions[] | select(.version == "'${version}'")' -| yq e '.git.revision' -)"
           clone_sample_repo $gitRepository $sampleDir/$version $revision
           mkdir $outputDir/$version
           cache_devfile $sampleDir/$version $outputDir/$version $sampleName

diff --git a/index/generator/go.mod b/index/generator/go.mod
@@ -3,8 +3,8 @@ module github.com/devfile/registry-support/index/generator
 go 1.18
 
 require (
-	github.com/devfile/api/v2 v2.2.0
-	github.com/devfile/library/v2 v2.2.1-0.20230323124903-d36e409ff94f
+	github.com/devfile/api/v2 v2.2.1
+	github.com/devfile/library/v2 v2.2.1
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249
@@ -25,6 +25,7 @@ require (
 	github.com/containerd/containerd v1.5.9 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/devfile/registry-support/registry-library v0.0.0-20221018213054-47b3ffaeadba // indirect
+	github.com/distribution/distribution/v3 v3.0.0-20211118083504-a29a3c99a684 // indirect
 	github.com/docker/cli v20.10.11+incompatible // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v20.10.11+incompatible // indirect

diff --git a/index/generator/go.sum b/index/generator/go.sum
diff --git a/index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/commands.go b/index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/commands.go
diff --git a/...ator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_container.go b/...ator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_container.go
diff --git a/...r/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_contribution.go b/...r/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_contribution.go
diff --git a/...enerator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_image.go b/...enerator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_image.go
diff --git a/...ndor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_image_dockerfile.go b/...ndor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_image_dockerfile.go
diff --git a/...endor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_kubernetes_like.go b/...endor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_kubernetes_like.go
diff --git a/...nerator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_plugin.go b/...nerator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_plugin.go
diff --git a/...nerator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_volume.go b/...nerator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_volume.go
diff --git a/index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/components.go b/index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/components.go
diff --git a/index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devfile.go b/index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devfile.go
diff --git a/.../vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspace_conversion.go b/.../vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspace_conversion.go
diff --git a/...rator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspace_types.go b/...rator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspace_types.go
diff --git a/...github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspacetemplate_conversion.go b/...github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspacetemplate_conversion.go
diff --git a/...endor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspacetemplate_spec.go b/...endor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspacetemplate_spec.go
diff --git a/...ndor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspacetemplate_types.go b/...ndor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspacetemplate_types.go
diff --git a/index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/doc.go b/index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/doc.go