Skip to content

Commit

Permalink
chore: Upgrade stack versions (#228)
Browse files Browse the repository at this point in the history
* chore: Upgrade stack versions

* Revert node upgrade
See nodejs/docker-node#1946
  • Loading branch information
valentindeaconu committed Apr 19, 2024
1 parent c3d1e3b commit 323340b
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/image.yml
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.22'

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.22'

- name: Install web UI dependencies
run: yarn --cwd ./web install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.22'

- name: Install task
uses: arduino/setup-task@v1
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM node:18-alpine3.17 AS frontend
FROM node:18-alpine3.19 AS frontend

WORKDIR /home/node/terralist

Expand All @@ -11,7 +11,7 @@ ENV TERRALIST_VERSION=${VERSION}
COPY ./web ./
RUN yarn build

FROM golang:1.20-alpine3.17 AS backend
FROM golang:1.22-alpine3.19 AS backend

WORKDIR /go/src/terralist

Expand Down
4 changes: 2 additions & 2 deletions Taskfile.yaml
Expand Up @@ -82,11 +82,11 @@ tasks:
BUILD_TAGS: "mocks"
env:
# Get rid of sqlite3 lib warnings
CGO_CFLAGS: "-g -O2 -Wno-return-local-addr"
CGO_CFLAGS: "-g -O2 -Wno-return-stack-address"
cmds:
- >-
{{- if eq .WITH_SUMMARY "true" -}}
gotestsum -f testname -- -tags={{.BUILD_TAGS}} -count=1 {{.TEST_PACKAGES}}
{{- else -}}
go test -tags=mocks -count=1 {{.TEST_PACKAGES}}
{{- end -}}
{{- end -}}
28 changes: 14 additions & 14 deletions go.mod
@@ -1,23 +1,23 @@
module terralist

go 1.20
go 1.22

require (
github.com/aws/aws-sdk-go v1.44.201
github.com/gin-gonic/gin v1.9.0
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/google/uuid v1.3.0
github.com/google/uuid v1.6.0
github.com/hashicorp/go-getter v1.7.0
github.com/mazen160/go-random v0.0.0-20210308102632-d2b501c85c03
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.29.0
github.com/smartystreets/goconvey v1.8.0
github.com/smartystreets/goconvey v1.8.1
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.15.0
gorm.io/driver/mysql v1.5.0
gorm.io/driver/postgres v1.5.0
gorm.io/driver/sqlite v1.4.4
gorm.io/gorm v1.25.3
gorm.io/driver/mysql v1.5.4
gorm.io/driver/postgres v1.5.7
gorm.io/driver/sqlite v1.5.5
gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde
)

require (
Expand All @@ -43,7 +43,7 @@ require (
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.3.0 // indirect
github.com/jackc/pgx/v5 v5.4.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jtolds/gls v4.20.0+incompatible // indirect
github.com/klauspost/compress v1.15.11 // indirect
Expand All @@ -53,13 +53,13 @@ require (
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/smartystreets/assertions v1.13.1 // indirect
github.com/smarty/assertions v1.15.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ulikunitz/xz v0.5.10 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.1.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.107.0 // indirect
Expand All @@ -86,7 +86,7 @@ require (
github.com/leodido/go-urn v1.2.1 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/mattn/go-sqlite3 v1.14.22 // indirect
github.com/mitchellh/mapstructure v1.5.0
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -98,9 +98,9 @@ require (
github.com/stretchr/testify v1.8.4
github.com/subosito/gotenv v1.4.2 // indirect
github.com/ugorji/go/codec v1.2.9 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down

0 comments on commit 323340b

Please sign in to comment.