From 47343999bb5744c7d95a10d324dec1994ec73e7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Tue, 4 May 2021 12:14:36 +0200 Subject: [PATCH 1/3] chore: match Go version with Beats development --- .go-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.go-version b/.go-version index 4ed70fac17..30a88ea45a 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.14.12 +1.15.9 From 8b3c8eb6005b93d8c10938ba3207f7f53e6eaa3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Tue, 4 May 2021 12:20:23 +0200 Subject: [PATCH 2/3] docs: update installation of Go --- e2e/_suites/fleet/README.md | 2 +- e2e/_suites/helm/README.md | 2 +- e2e/_suites/kubernetes-autodiscover/README.md | 2 +- e2e/_suites/metricbeat/README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/_suites/fleet/README.md b/e2e/_suites/fleet/README.md index 94cf727cdd..438c3fa2e2 100644 --- a/e2e/_suites/fleet/README.md +++ b/e2e/_suites/fleet/README.md @@ -66,7 +66,7 @@ This is an example of the optional configuration: 4. Install dependencies. - - Install Go: `https://golang.org/doc/install` _(The CI uses [GVM](https://github.com/andrewkroh/gvm))_ + - Install Go, using the language version defined in the `.go-version` file at the root directory. We recommend using [GVM](https://github.com/andrewkroh/gvm), same as done in the CI, which will allow you to install multiple versions of Go, setting the Go environment in consequence: `eval "$(gvm 1.15.9)"` - Install integrations `make -C e2e sync-integrations` - Install godog (from project's root directory): `make -C e2e install-godog` diff --git a/e2e/_suites/helm/README.md b/e2e/_suites/helm/README.md index 565aed3913..8ccb37dcad 100644 --- a/e2e/_suites/helm/README.md +++ b/e2e/_suites/helm/README.md @@ -42,7 +42,7 @@ This is an example of the optional configuration: - Install Helm 3.5.2 - Install Kind 0.10.0 - - Install Go: `https://golang.org/doc/install` _(The CI uses [GVM](https://github.com/andrewkroh/gvm))_ + - Install Go, using the language version defined in the `.go-version` file at the root directory. We recommend using [GVM](https://github.com/andrewkroh/gvm), same as done in the CI, which will allow you to install multiple versions of Go, setting the Go environment in consequence: `eval "$(gvm 1.15.9)"` - Install godog (from project's root directory): `make -C e2e install-godog` 4. Run the tests. diff --git a/e2e/_suites/kubernetes-autodiscover/README.md b/e2e/_suites/kubernetes-autodiscover/README.md index 2f35723856..c7a6878757 100644 --- a/e2e/_suites/kubernetes-autodiscover/README.md +++ b/e2e/_suites/kubernetes-autodiscover/README.md @@ -120,7 +120,7 @@ This is an example of the optional configuration: - Install Kubectl 1.18 or newer - Install Kind 0.10.0 or newer - - Install Go: `https://golang.org/doc/install` _(The CI uses [GVM](https://github.com/andrewkroh/gvm))_ + - Install Go, using the language version defined in the `.go-version` file at the root directory. We recommend using [GVM](https://github.com/andrewkroh/gvm), same as done in the CI, which will allow you to install multiple versions of Go, setting the Go environment in consequence: `eval "$(gvm 1.15.9)"` - Install godog (from project's root directory): `make -C e2e install-godog` 4. Run the tests. diff --git a/e2e/_suites/metricbeat/README.md b/e2e/_suites/metricbeat/README.md index 0c36e002b2..fdd4e572d1 100644 --- a/e2e/_suites/metricbeat/README.md +++ b/e2e/_suites/metricbeat/README.md @@ -61,7 +61,7 @@ This is an example of the optional configuration: 4. Install dependencies. - - Install Go: `https://golang.org/doc/install` _(The CI uses [GVM](https://github.com/andrewkroh/gvm))_ + - Install Go, using the language version defined in the `.go-version` file at the root directory. We recommend using [GVM](https://github.com/andrewkroh/gvm), same as done in the CI, which will allow you to install multiple versions of Go, setting the Go environment in consequence: `eval "$(gvm 1.15.9)"` - Install godog (from project's root directory): `make -C e2e install-godog` 5. Run the tests. From cbfc162b86194582372419a888efc9a0d1479c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Tue, 4 May 2021 12:21:56 +0200 Subject: [PATCH 3/3] docs: fix make goal --- e2e/_suites/fleet/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/_suites/fleet/README.md b/e2e/_suites/fleet/README.md index 438c3fa2e2..e0119b5d79 100644 --- a/e2e/_suites/fleet/README.md +++ b/e2e/_suites/fleet/README.md @@ -67,7 +67,7 @@ This is an example of the optional configuration: 4. Install dependencies. - Install Go, using the language version defined in the `.go-version` file at the root directory. We recommend using [GVM](https://github.com/andrewkroh/gvm), same as done in the CI, which will allow you to install multiple versions of Go, setting the Go environment in consequence: `eval "$(gvm 1.15.9)"` - - Install integrations `make -C e2e sync-integrations` + - Install integrations `make -C cli sync-integrations` - Install godog (from project's root directory): `make -C e2e install-godog` 5. Run the tests.