Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump cnab-go, Go, docker, containerd and k8s (on stable) #1971

Merged
merged 2 commits into from
Mar 22, 2022
Merged

Bump cnab-go, Go, docker, containerd and k8s (on stable) #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d116ca
Bump cnab-go, cnab-to-oci, Go, docker, containerd and k8s
carolynvs Mar 14, 2022
c4fecda
Bump to cnab-to-oci 0.3.3
carolynvs Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/azure-pipelines.integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pool:
vmImage: "ubuntu-latest"

variables:
GOVERSION: "1.16"
GOVERSION: "1.17.8"

jobs:
- job: integration_test
Expand Down
2 changes: 1 addition & 1 deletion build/azure-pipelines.pr-automatic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pool:
vmImage: "ubuntu-latest"

variables:
GOVERSION: "1.16"
GOVERSION: "1.17.8"

parameters:
- name: buildExamples
Expand Down
2 changes: 1 addition & 1 deletion build/azure-pipelines.release-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ variables: # these are really constants
parameters:
- name: goVersion
type: string
default: "1.16"
default: "1.17.8"
- name: registry
type: string
default: getporterci
Expand Down
2 changes: 1 addition & 1 deletion docs/content/contribute/tutorial.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ and executing the commands.
If you are new to Git or GitHub, we recommend reading the [GitHub Guides].
They will walk you through installing Git, forking a repository and
submitting a pull request.
* [Go](https://golang.org/doc/install) version 1.13 or higher
* [Go](https://golang.org/doc/install) version 1.17 or higher
* [Docker]
* Make. You can install it with a package manager such as apt-get, or homebrew.
* [Mage](#install-mage)
Expand Down
61 changes: 25 additions & 36 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
module get.porter.sh/porter

go 1.13
// I am not bumping v0.38 beyond compatibility with 1.16 because it causes go mod tidy to fail with
// go.opentelemetry.io/otel/semconv: module go.opentelemetry.io/otel@latest found (v1.4.1), but does not contain package go.opentelemetry.io/otel/semconv
// It's okay to _build with_ Go 1.17+ but it needs to be in the older compatibility mode
go 1.16

replace (
// This points to a tag off of the porter-stable branch, since cnab-go main has diverged to support Porter v1.
// The tagging scheme is LATEST_TAG_FROM_CNABGO-porter.N where N allows for us to make multiple
// tags based on the same underlying version of cnab-go.
github.com/cnabio/cnab-go => github.com/getporter/cnab-go v0.19.0-porter.4

// return-copy-error
// See https://github.com/cnabio/cnab-to-oci/pull/113
github.com/cnabio/cnab-to-oci => github.com/getporter/cnab-to-oci v0.3.1-porter.1

// See https://github.com/containerd/containerd/issues/3031
// When I try to just use the require, go is shortening it to v2.7.1+incompatible which then fails to build...
github.com/docker/distribution => github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
github.com/cnabio/cnab-go => github.com/getporter/cnab-go v0.19.0-porter.5

// See https://github.com/hashicorp/go-plugin/pull/127 and
// https://github.com/hashicorp/go-plugin/pull/163
Expand All @@ -25,54 +19,49 @@ replace (

// local-keyword-registry
github.com/qri-io/jsonschema => github.com/carolynvs/jsonschema v0.2.1-0.20210602145235-283986347fba

golang.org/x/sys => golang.org/x/sys v0.0.0-20190830141801-acfa387b8d69
)

require (
github.com/Masterminds/semver/v3 v3.1.1
github.com/PaesslerAG/jsonpath v0.1.1
github.com/PuerkitoBio/goquery v1.5.0 // indirect
github.com/carolynvs/aferox v0.2.1
github.com/carolynvs/aferox v0.3.0
github.com/carolynvs/datetime-printer v0.2.0
github.com/carolynvs/magex v0.6.0
github.com/cbroglie/mustache v1.0.1
github.com/cnabio/cnab-go v0.19.0
github.com/cnabio/cnab-to-oci v0.3.1-beta1.0.20210614060230-e4d2bd5441c8
github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340 // indirect
github.com/containerd/containerd v1.3.0
github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c // indirect
github.com/containerd/fifo v0.0.0-20191213151349-ff969a566b00 // indirect
github.com/containerd/ttrpc v1.0.0 // indirect
github.com/containerd/typeurl v1.0.0 // indirect
github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v1.4.2-0.20181229214054-f76d6a078d88
github.com/docker/go-metrics v0.0.1 // indirect
github.com/cnabio/cnab-go v0.23.1
github.com/cnabio/cnab-to-oci v0.3.3
github.com/containerd/containerd v1.6.1
github.com/docker/cli v20.10.13+incompatible
github.com/docker/distribution v2.8.1+incompatible
github.com/docker/docker v20.10.13+incompatible
github.com/dustin/go-humanize v1.0.0
github.com/ghodss/yaml v1.0.0
github.com/gobuffalo/packr/v2 v2.8.0
github.com/gogo/googleapis v1.3.2 // indirect
github.com/google/go-containerregistry v0.0.0-20191015185424-71da34e4d9b3
github.com/gobuffalo/packr/v2 v2.8.3
github.com/google/go-containerregistry v0.5.1
github.com/hashicorp/go-hclog v0.14.1
github.com/hashicorp/go-multierror v1.1.0
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-plugin v1.4.0
github.com/hashicorp/go-version v1.2.0 // indirect
github.com/magefile/mage v1.11.0
github.com/mikefarah/yq/v3 v3.0.0-20201020025845-ccb718cd0f59
github.com/mmcdole/gofeed v1.0.0-beta2
github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
github.com/olekukonko/tablewriter v0.0.4
github.com/pivotal/image-relocation v0.0.0-20191111101224-e94aff6df06c
github.com/pkg/errors v0.9.1
github.com/spf13/afero v1.4.1
github.com/spf13/cobra v1.1.3
github.com/spf13/afero v1.8.2
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.7.0
github.com/spf13/viper v1.8.1
github.com/stretchr/testify v1.7.0
github.com/xeipuuv/gojsonschema v1.2.0
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
gopkg.in/AlecAivazis/survey.v1 v1.8.7
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)

require (
github.com/PuerkitoBio/goquery v1.5.0 // indirect
github.com/fvbommel/sortorder v1.0.2 // indirect
github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
github.com/moby/buildkit v0.10.0 // indirect
)
Loading