Skip to content

Commit

Permalink
fix: revert upgrade to Go v1.20 (#1613)
Browse files Browse the repository at this point in the history
* fix: revert upgrade to Go v1.20

* Revert "chore(deps): update dependency newrelic/nri-flex to v1.8.0 (#1610)"

This reverts commit b50b38a.
  • Loading branch information
DavSanchez authored Mar 29, 2023
1 parent 6421987 commit 2263406
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/actions/external_runner/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module main

go 1.20
go 1.19

require (
github.com/aws/aws-sdk-go-v2 v1.16.4
Expand Down
4 changes: 2 additions & 2 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.2-bullseye
FROM golang:1.19.5-bullseye

ARG GH_VERSION='2.0.0'
ARG GH_ARCH='amd64'
Expand All @@ -16,4 +16,4 @@ RUN curl -L https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_
RUN dpkg -i gh_${GH_VERSION}_linux_${GH_ARCH}.deb

ENV GOFLAGS="-buildvcs=false"
RUN git config --global --add safe.directory /go/src/github.com/newrelic/infrastructure-agent
RUN git config --global --add safe.directory /go/src/github.com/newrelic/infrastructure-agent
2 changes: 1 addition & 1 deletion build/ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG ANSIBLE_INVENTORY_FOLDER_ARG="/srv/runner/inventory/$REF_ARG"
ARG ANSIBLE_INVENTORY_FILE_ARG="inventory.ec2"

ARG ANSIBLE_VERSION="6.5.0"
ARG GO_VERSION="1.20.2"
ARG GO_VERSION="1.19.5"

ENV REF=$REF_ARG
ENV ANSIBLE_INVENTORY="$ANSIBLE_INVENTORY_FOLDER_ARG/$ANSIBLE_INVENTORY_FILE_ARG"
Expand Down
2 changes: 1 addition & 1 deletion build/embed/integrations.version
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ohi-repo-name,version
nri-docker,v1.8.0
nri-flex,v1.8.0
nri-flex,v1.7.2
nri-winservices,v1.0.0
nri-prometheus,v2.18.0
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/newrelic/infrastructure-agent

go 1.20
go 1.19

require (
github.com/Microsoft/go-winio v0.5.1
Expand Down
4 changes: 2 additions & 2 deletions test/databind/fargate/Dockerfile_test
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.20
FROM golang:1.19

WORKDIR /go/src/github.com/newrelic/infrastructure-agent/

COPY . .

CMD ["sleep", "1h"]
CMD ["sleep", "1h"]
2 changes: 1 addition & 1 deletion test/packaging/ansible/roles/repo-setup/vars/main.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
go_version: 1.20
go_version: 1.19
repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"

repos_to_clean:
Expand Down
2 changes: 1 addition & 1 deletion test/proxy/Dockerfile_agent
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as builder
FROM golang:1.19 as builder

ARG CGO_ENABLED=0
WORKDIR /go/src/github.com/newrelic/infrastructure-agent
Expand Down
2 changes: 1 addition & 1 deletion test/proxy/Dockerfile_collector
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as builder
FROM golang:1.19 as builder
ARG CGO_ENABLED=0
WORKDIR /go/src/github.com/newrelic/infrastructure-agent
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion tools/cdn-purge/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/newrelic/infrastructure-agent/tools/cdn-purge

go 1.20
go 1.19

require github.com/aws/aws-sdk-go v1.39.0

Expand Down
2 changes: 1 addition & 1 deletion tools/provision-alerts/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module provision-alerts

go 1.20
go 1.19

require (
github.com/stretchr/testify v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion tools/spin-ec2/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module spin-ec2

go 1.20
go 1.19

require (
github.com/spf13/cobra v1.2.1
Expand Down

0 comments on commit 2263406

Please sign in to comment.