diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 9670070..b53263e 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -12,11 +12,10 @@ jobs: runs-on: ubuntu-20.04 steps: - - name: Set up Go 1.14 + - name: Set up Go uses: actions/setup-go@v2 with: go-version: 1.14 - id: go - name: Check out code into the Go module directory uses: actions/checkout@v2 diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 40ba84c..4cb0881 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -9,14 +9,13 @@ on: jobs: integration-test: name: Integration test - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - - name: Set up Go 1.14 + - name: Set up Go uses: actions/setup-go@v2 with: go-version: 1.14 - id: go - name: Check out code into the Go module directory uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba72eb5..206c024 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: goreleaser: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout @@ -18,7 +18,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.15 + go-version: 1.14 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 diff --git a/README.md b/README.md index f521192..557abb7 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This program generates a custom OpenTelemetry Collector binary based on a given $ go get github.com/observatorium/opentelemetry-collector-builder $ cat > ~/.otelcol-builder.yaml < /tmp/otelcol.yaml < github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.18.0 + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.19.0 ``` diff --git a/internal/builder/config.go b/internal/builder/config.go index 054c8ec..a7ea82d 100644 --- a/internal/builder/config.go +++ b/internal/builder/config.go @@ -26,7 +26,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.18.0" +const defaultOtelColVersion = "0.19.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/internal/scaffold/gomod.go b/internal/scaffold/gomod.go index 46fe0ab..741352e 100644 --- a/internal/scaffold/gomod.go +++ b/internal/scaffold/gomod.go @@ -17,7 +17,7 @@ package scaffold const Gomod = ` module {{.Distribution.Module}} -go 1.14 +go 1.15 require ( {{- range .Extensions}} diff --git a/test/nocore.builder.yaml b/test/nocore.builder.yaml index 6a46995..243e485 100644 --- a/test/nocore.builder.yaml +++ b/test/nocore.builder.yaml @@ -1,6 +1,6 @@ dist: module: github.com/observatorium/opentelemetry-collector-builder/test/nocore - otelcol_version: 0.18.0 + otelcol_version: 0.19.0 include_core: false receivers: diff --git a/test/replaces.builder.yaml b/test/replaces.builder.yaml index 27fa15d..dc9e872 100644 --- a/test/replaces.builder.yaml +++ b/test/replaces.builder.yaml @@ -1,10 +1,10 @@ dist: module: github.com/observatorium/opentelemetry-collector-builder/test/replaces - otelcol_version: 0.18.0 + otelcol_version: 0.19.0 processors: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.18.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.18.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.19.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.19.0 replaces: - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.18.0 + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.19.0