Skip to content

Commit

Permalink
feat: upgrade to go 1.21 and bump deps (#273)
Browse files Browse the repository at this point in the history
* feat: upgrade to go 1.21 and bump deps

Signed-off-by: Thomas O'Neill <[email protected]>

* ci: bump golint to latest

Signed-off-by: Thomas O'Neill <[email protected]>

* ci: Use node 18.x

Signed-off-by: Thomas O'Neill <[email protected]>

* build: use legacy provider when running ng build

Signed-off-by: Thomas O'Neill <[email protected]>

---------

Signed-off-by: Thomas O'Neill <[email protected]>
Co-authored-by: Thomas O'Neill <[email protected]>
  • Loading branch information
toneill818 and toneill-newinnov committed Feb 29, 2024
1 parent 298a16a commit 6d4c52a
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 82 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@ on:
- release-*
tags:
- v*
paths-ignore:
- '**.md'
paths-ignore:
- "**.md"
pull_request:
branches:
- master
- release-*
paths-ignore:
- '**.md'
paths-ignore:
- "**.md"
jobs:
build:
name: Build ${{ matrix.target_os }}_${{ matrix.target_arch }} binaries
runs-on: ${{ matrix.os }}
env:
GOVER: 1.19
GOLANGCILINT_VER: 1.50.1
GOVER: 1.21
GOLANGCILINT_VER: 1.56.2
GOOS: ${{ matrix.target_os }}
GOARCH: ${{ matrix.target_arch }}
GOPROXY: https://proxy.golang.org
NODE_VERSION: 16.x
NODE_VERSION: 18.x
ARTIFACTS_DIR: release/artifacts
strategy:
matrix:
Expand Down Expand Up @@ -325,4 +325,4 @@ jobs:
# If not, this update was accidentally triggered by tagging a release before updating the Helm chart.
echo "::error::There is no change for ${daprVersion} Helm chart. Did you forget to update the chart version before tagging?"
exit -1
fi
fi
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ $(5)/$(1):
-o $(5)/$(1) \
./main.go;
mkdir -p $(5)/web/dist
cd web && npm i && ng build --outputPath=../$(5)/web/dist
cd web && npm i && NODE_OPTIONS=--openssl-legacy-provider ng build --outputPath=../$(5)/web/dist
endef

# Generate binary targets
Expand Down
50 changes: 25 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
module github.com/dapr/dashboard

go 1.19
go 1.21

require (
github.com/compose-spec/compose-go v1.13.3
github.com/dapr/cli v1.10.0-rc.3
github.com/dapr/components-contrib v1.10.0-rc.4
github.com/dapr/dapr v1.10.0-rc.5
github.com/dapr/kit v0.0.4
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.5.0
github.com/compose-spec/compose-go v1.20.2
github.com/dapr/cli v1.10.0
github.com/dapr/components-contrib v1.10.10
github.com/dapr/dapr v1.10.10
github.com/dapr/kit v0.12.1
github.com/gorilla/mux v1.8.1
github.com/gorilla/websocket v1.5.1
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.8.4
k8s.io/api v0.26.1
k8s.io/apimachinery v0.26.1
k8s.io/client-go v1.5.2
sigs.k8s.io/yaml v1.3.0
sigs.k8s.io/yaml v1.4.0
)

require (
Expand All @@ -27,20 +27,19 @@ require (
github.com/PuerkitoBio/purell v1.2.0 // indirect
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/briandowns/spinner v1.21.0 // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/containerd/containerd v1.6.16 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/distribution/v3 v3.0.0-20230214150026-36d8c594d7aa // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v23.0.0+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fasthttp/router v1.4.16 // indirect
Expand Down Expand Up @@ -74,7 +73,7 @@ require (
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/jhump/protoreflect v1.14.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand Down Expand Up @@ -109,7 +108,7 @@ require (
github.com/prometheus/statsd_exporter v0.23.0 // indirect
github.com/rivo/uniseg v0.4.3 // indirect
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sony/gobreaker v0.5.0 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand All @@ -124,6 +123,7 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.mongodb.org/mongo-driver v1.11.6 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel v1.13.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 // indirect
Expand All @@ -134,16 +134,16 @@ require (
go.opentelemetry.io/otel/sdk v1.13.0 // indirect
go.opentelemetry.io/otel/trace v1.13.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.6.0 // indirect
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.5.0 // indirect
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect
Expand All @@ -157,7 +157,7 @@ require (
k8s.io/component-base v0.26.1 // indirect
k8s.io/klog/v2 v2.90.0 // indirect
k8s.io/kube-openapi v0.0.0-20230202010329-39b3636cbaa3 // indirect
k8s.io/utils v0.0.0-20230202215443-34013725500c // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/controller-runtime v0.14.4 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand Down
Loading

0 comments on commit 6d4c52a

Please sign in to comment.