Skip to content

Commit

Permalink
Merge pull request #236 from ulucinar/bump-go1.20
Browse files Browse the repository at this point in the history
Bump Go version to v1.20 in go.mod
  • Loading branch information
ulucinar committed Jul 20, 2023
2 parents b70acc1 + 11a1e20 commit accab08
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ on:

env:
# Common versions
GO_VERSION: '1.19'
GOLANGCI_VERSION: 'v1.50.0'
GO_VERSION: '1.20'
GOLANGCI_VERSION: 'v1.53.3'
DOCKER_BUILDX_VERSION: 'v0.8.2'

# Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
submodules: true

- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: ${{ env.GO_VERSION }}

Expand Down Expand Up @@ -81,10 +81,9 @@ jobs:
# this action because it leaves 'annotations' (i.e. it comments on PRs to
# point out linter violations).
- name: Lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299 # v3
with:
version: ${{ env.GOLANGCI_VERSION }}
skip-go-installation: true

check-diff:
runs-on: ubuntu-20.04
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
PROJECT_NAME := upjet
PROJECT_REPO := github.com/upbound/$(PROJECT_NAME)

GOLANGCILINT_VERSION ?= 1.50.0
GO_REQUIRED_VERSION ?= 1.19
GOLANGCILINT_VERSION ?= 1.53.3
GO_REQUIRED_VERSION ?= 1.20

PLATFORMS ?= linux_amd64 linux_arm64
# -include will silently skip missing files, which allows us
Expand Down
2 changes: 1 addition & 1 deletion build
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/upbound/upjet

go 1.19
go 1.20

require (
github.com/antchfx/htmlquery v1.2.4
Expand Down
2 changes: 1 addition & 1 deletion pkg/migration/filesystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func (ft *FileSystemTarget) Put(o UnstructuredWithMetadata) error {

defer f.Close() //nolint:errcheck

if _, err = f.WriteString(fmt.Sprintf("\n---\n\n%s", string(b))); err != nil {
if _, err = fmt.Fprintf(f, "\n---\n\n%s", string(b)); err != nil {
return errors.Wrap(err, "cannot write file")
}
} else {
Expand Down

0 comments on commit accab08

Please sign in to comment.