Skip to content

Commit b5f8893

Browse files
authored
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]>
1 parent 1168591 commit b5f8893

File tree

150 files changed

+6406
-538
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+6406
-538
lines changed

build-tools/cache_samples.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ function cache_sample() {
4848

4949
# Git clone the sample project
5050
gitRepository="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.git.remotes.origin)' -)"
51-
revision="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.git.checkoutFrom.revision)' -)"
51+
revision="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.git.revision)' -)"
5252
if [[ $gitRepository == "null" ]]; then
5353
for version in $(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.versions[].version)' -); do
5454
gitRepository="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.versions[] | select(.version == "'${version}'")' -| yq e '.git.remotes.origin' -)"
55-
revision="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.versions[] | select(.version == "'${version}'")' -| yq e '.git.checkoutFrom.revision' -)"
55+
revision="$(yq e '(.samples[] | select(.name == "'${sampleName}'")' $devfileEntriesFile | yq e '(.versions[] | select(.version == "'${version}'")' -| yq e '.git.revision' -)"
5656
clone_sample_repo $gitRepository $sampleDir/$version $revision
5757
mkdir $outputDir/$version
5858
cache_devfile $sampleDir/$version $outputDir/$version $sampleName

index/generator/go.mod

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/devfile/registry-support/index/generator
33
go 1.18
44

55
require (
6-
github.com/devfile/api/v2 v2.2.0
7-
github.com/devfile/library/v2 v2.2.1-0.20230323124903-d36e409ff94f
6+
github.com/devfile/api/v2 v2.2.1
7+
github.com/devfile/library/v2 v2.2.1
88
github.com/go-git/go-git/v5 v5.4.2
99
github.com/mitchellh/go-homedir v1.1.0
1010
github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249
@@ -25,6 +25,7 @@ require (
2525
github.com/containerd/containerd v1.5.9 // indirect
2626
github.com/davecgh/go-spew v1.1.1 // indirect
2727
github.com/devfile/registry-support/registry-library v0.0.0-20221018213054-47b3ffaeadba // indirect
28+
github.com/distribution/distribution/v3 v3.0.0-20211118083504-a29a3c99a684 // indirect
2829
github.com/docker/cli v20.10.11+incompatible // indirect
2930
github.com/docker/distribution v2.7.1+incompatible // indirect
3031
github.com/docker/docker v20.10.11+incompatible // indirect

index/generator/go.sum

+4-176
Large diffs are not rendered by default.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/commands.go

+21-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_container.go

+17-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_contribution.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_image.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_image_dockerfile.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_kubernetes_like.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_plugin.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/component_volume.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/components.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devfile.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspace_conversion.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspace_types.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspacetemplate_conversion.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspacetemplate_spec.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/devworkspacetemplate_types.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index/generator/vendor/github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2/doc.go

+17-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)