Skip to content

Commit

Permalink
chore: Update Go version to 1.20 (#68)
Browse files Browse the repository at this point in the history
  • Loading branch information
gsanchezgavier authored Jun 2, 2023
1 parent 6add9cd commit 857910f
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 15 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GO_VERSION: '1.18'
INTEGRATION: "nagios"
ORIGINAL_REPO_NAME: 'newrelic/nri-nagios'
REPO_FULL_NAME: ${{ github.event.repository.full_name }}
Expand Down Expand Up @@ -43,9 +42,9 @@ jobs:
with:
path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: ${{env.GO_VERSION}}
go-version-file: "src/github.com/${{ env.ORIGINAL_REPO_NAME }}/go.mod"
- name: Running unit tests
shell: pwsh
run: |
Expand All @@ -64,9 +63,9 @@ jobs:
fetch-depth: 1
path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: ${{env.GO_VERSION}}
go-version-file: "src/github.com/${{ env.ORIGINAL_REPO_NAME }}/go.mod"
- name: Integration test
env:
GOPATH: ${{ github.workspace }}
Expand Down Expand Up @@ -197,4 +196,4 @@ jobs:
integration: nri-${{ env.INTEGRATION }}
packageLocation: repo
stagingRepo: true
upgrade: false
upgrade: false
9 changes: 4 additions & 5 deletions .github/workflows/push_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ env:
TAG: "v0.0.0" # needed for goreleaser windows builds
REPO_FULL_NAME: ${{ github.event.repository.full_name }}
ORIGINAL_REPO_NAME: "newrelic/nri-nagios"
GO_VERSION: '1.18'
DOCKER_LOGIN_AVAILABLE: ${{ secrets.OHAI_DOCKER_HUB_ID }}

jobs:
Expand Down Expand Up @@ -59,9 +58,9 @@ jobs:
with:
path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: ${{env.GO_VERSION}}
go-version-file: "src/github.com/${{ env.ORIGINAL_REPO_NAME }}/go.mod"
- name: Running unit tests
shell: pwsh
run: |
Expand All @@ -80,9 +79,9 @@ jobs:
fetch-depth: 1
path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: ${{env.GO_VERSION}}
go-version-file: "src/github.com/${{ env.ORIGINAL_REPO_NAME }}/go.mod"
- name: Login to DockerHub
if: ${{env.DOCKER_LOGIN_AVAILABLE}}
uses: docker/login-action@v1
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## 2.9.0 (2023-06-06)
# Changed
- Upgrade Go version to 1.20

## 2.8.3 (2022-07-05)
### Changed
- Bump dependencies
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18-buster
FROM golang:1.20-buster

ARG GH_VERSION='1.9.2'

Expand Down
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/nri-nagios

go 1.18
go 1.20

require (
github.com/newrelic/infra-integrations-sdk v3.7.3+incompatible
Expand Down
4 changes: 2 additions & 2 deletions tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ services:
restart: always

nri-nagios:
image: golang:1.18
image: golang:1.20-buster
container_name: nri_nagios
working_dir: /code
depends_on:
- nagios
volumes:
- ../:/code
entrypoint: go run /code/src/main.go
entrypoint: go run /code/src/main.go

0 comments on commit 857910f

Please sign in to comment.