Skip to content

Commit

Permalink
Update CI go version and update the devfile.yaml
Browse files Browse the repository at this point in the history
Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
  • Loading branch information
l0rd committed Jun 14, 2022
1 parent 90574dc commit a7359cd
Show file tree
Hide file tree
Showing 24 changed files with 112 additions and 143 deletions.
2 changes: 2 additions & 0 deletions .che/che-editor.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
id: che-incubator/che-code/insiders
registryUrl: https://eclipse-che.github.io/che-plugin-registry/main/v3
41 changes: 41 additions & 0 deletions .devfile.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Copyright (c) 2022 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
schemaVersion: 2.1.0
metadata:
name: devfile-api
attributes:
controller.devfile.io/storage-type: ephemeral
components:
- name: devtools
container:
image: "quay.io/devfile/universal-developer-image:ubi8-latest"
memoryLimit: 2Gi
memoryRequest: 256Mi
commands:
- id: build-crds-and-schemas
exec:
component: devtools
commandLine: ./build.sh
label: Run build of CRDs and schemas
- id: fetch-dependencies-for-go-ls
exec:
component: devtools
commandLine: go mod vendor
label: Fetch dependencies for Go LS
- id: test
exec:
component: devtools
commandLine: go test -v ./...
label: Run tests
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/setup-go@v2.1.3
with:
# The Go version to download (if necessary) and use. Supports semver spec and ranges.
go-version: 1.13
go-version: 1.18

- name: Generate Go sources, CRDs and schemas
run: |
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ Session.vim
# auto-generated tag files
tags
### VisualStudioCode ###
.vscode/*
.history
# End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode
# IDE folders
Expand Down
11 changes: 11 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"eamodio.gitlens",
"GitHub.vscode-pull-request-github",
"golang.go",
"redhat.vscode-xml",
"redhat.vscode-yaml",
]
}
1 change: 0 additions & 1 deletion devfile.api.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
},
"go.useLanguageServer": true,
"go.languageServerExperimentalFeatures": {
"documentLink": true,
"diagnostics": true // for diagnostics as you type
},
"go.autocompleteUnimportedPackages": true,
Expand Down
63 changes: 0 additions & 63 deletions devfile.yaml

This file was deleted.

25 changes: 24 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/devfile/api/v2

go 1.13
go 1.18

require (
github.com/ghodss/yaml v1.0.0
Expand All @@ -17,3 +17,26 @@ require (
sigs.k8s.io/controller-runtime v0.9.5
sigs.k8s.io/yaml v1.2.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
golang.org/x/text v0.3.6 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/klog/v2 v2.8.0 // indirect
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
)
3 changes: 0 additions & 3 deletions vendor/github.com/go-logr/logr/go.mod

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/google/gofuzz/go.mod

This file was deleted.

1 change: 0 additions & 1 deletion vendor/github.com/hashicorp/errwrap/go.mod

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/hashicorp/go-multierror/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/github.com/hashicorp/go-multierror/go.sum

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/json-iterator/go/go.mod

This file was deleted.

15 changes: 0 additions & 15 deletions vendor/github.com/json-iterator/go/go.sum

This file was deleted.

1 change: 0 additions & 1 deletion vendor/github.com/mitchellh/reflectwalk/go.mod

This file was deleted.

1 change: 0 additions & 1 deletion vendor/github.com/santhosh-tekuri/jsonschema/go.mod

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/gopkg.in/yaml.v2/go.mod

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/gopkg.in/yaml.v3/go.mod

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/k8s.io/klog/v2/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/k8s.io/klog/v2/go.sum

This file was deleted.

33 changes: 33 additions & 0 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -1,67 +1,88 @@
# github.com/davecgh/go-spew v1.1.1
## explicit
github.com/davecgh/go-spew/spew
# github.com/ghodss/yaml v1.0.0
## explicit
github.com/ghodss/yaml
# github.com/go-logr/logr v0.4.0
## explicit; go 1.14
github.com/go-logr/logr
# github.com/gogo/protobuf v1.3.2
## explicit; go 1.15
github.com/gogo/protobuf/proto
github.com/gogo/protobuf/sortkeys
# github.com/golang/protobuf v1.5.2
## explicit; go 1.9
github.com/golang/protobuf/proto
github.com/golang/protobuf/ptypes
github.com/golang/protobuf/ptypes/any
github.com/golang/protobuf/ptypes/duration
github.com/golang/protobuf/ptypes/timestamp
# github.com/google/go-cmp v0.5.5
## explicit; go 1.8
github.com/google/go-cmp/cmp
github.com/google/go-cmp/cmp/internal/diff
github.com/google/go-cmp/cmp/internal/flags
github.com/google/go-cmp/cmp/internal/function
github.com/google/go-cmp/cmp/internal/value
# github.com/google/gofuzz v1.2.0
## explicit; go 1.12
github.com/google/gofuzz
github.com/google/gofuzz/bytesource
# github.com/googleapis/gnostic v0.5.5
## explicit; go 1.12
github.com/googleapis/gnostic/compiler
github.com/googleapis/gnostic/extensions
github.com/googleapis/gnostic/jsonschema
github.com/googleapis/gnostic/openapiv2
# github.com/hashicorp/errwrap v1.0.0
## explicit
github.com/hashicorp/errwrap
# github.com/hashicorp/go-multierror v1.1.0
## explicit; go 1.14
github.com/hashicorp/go-multierror
# github.com/json-iterator/go v1.1.11
## explicit; go 1.12
github.com/json-iterator/go
# github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb
## explicit
github.com/lucasjones/reggen
# github.com/mitchellh/reflectwalk v1.0.1
## explicit
github.com/mitchellh/reflectwalk
# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
## explicit
github.com/modern-go/concurrent
# github.com/modern-go/reflect2 v1.0.1
## explicit
github.com/modern-go/reflect2
# github.com/pmezard/go-difflib v1.0.0
## explicit
github.com/pmezard/go-difflib/difflib
# github.com/santhosh-tekuri/jsonschema v1.2.4
## explicit
github.com/santhosh-tekuri/jsonschema
github.com/santhosh-tekuri/jsonschema/decoders
github.com/santhosh-tekuri/jsonschema/formats
github.com/santhosh-tekuri/jsonschema/loader
github.com/santhosh-tekuri/jsonschema/mediatypes
# github.com/stretchr/testify v1.7.0
## explicit; go 1.13
github.com/stretchr/testify/assert
# golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
## explicit; go 1.11
golang.org/x/net/http/httpguts
golang.org/x/net/http2
golang.org/x/net/http2/hpack
golang.org/x/net/idna
# golang.org/x/text v0.3.6
## explicit; go 1.11
golang.org/x/text/secure/bidirule
golang.org/x/text/transform
golang.org/x/text/unicode/bidi
golang.org/x/text/unicode/norm
# google.golang.org/protobuf v1.26.0
## explicit; go 1.9
google.golang.org/protobuf/encoding/prototext
google.golang.org/protobuf/encoding/protowire
google.golang.org/protobuf/internal/descfmt
Expand Down Expand Up @@ -93,17 +114,23 @@ google.golang.org/protobuf/types/known/anypb
google.golang.org/protobuf/types/known/durationpb
google.golang.org/protobuf/types/known/timestamppb
# gopkg.in/inf.v0 v0.9.1
## explicit
gopkg.in/inf.v0
# gopkg.in/yaml.v2 v2.4.0
## explicit; go 1.15
gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
## explicit
gopkg.in/yaml.v3
# k8s.io/api v0.21.3
## explicit; go 1.16
k8s.io/api/core/v1
# k8s.io/apiextensions-apiserver v0.21.3
## explicit; go 1.16
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
# k8s.io/apimachinery v0.21.3
## explicit; go 1.16
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/resource
k8s.io/apimachinery/pkg/apis/meta/v1
Expand Down Expand Up @@ -132,15 +159,21 @@ k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/json
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/klog/v2 v2.8.0
## explicit; go 1.13
k8s.io/klog/v2
# k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
## explicit; go 1.12
k8s.io/kube-openapi/pkg/util/proto
# k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471
## explicit; go 1.12
k8s.io/utils/pointer
# sigs.k8s.io/controller-runtime v0.9.5
## explicit; go 1.16
sigs.k8s.io/controller-runtime/pkg/conversion
sigs.k8s.io/controller-runtime/pkg/scheme
# sigs.k8s.io/structured-merge-diff/v4 v4.1.2
## explicit; go 1.13
sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.2.0
## explicit; go 1.12
sigs.k8s.io/yaml
8 changes: 0 additions & 8 deletions vendor/sigs.k8s.io/yaml/go.mod

This file was deleted.

Loading

0 comments on commit a7359cd

Please sign in to comment.