From 5300b0f7ca1e59cee1da2459610398d6cda0d5f7 Mon Sep 17 00:00:00 2001 From: mornyx Date: Wed, 20 Dec 2023 16:40:07 +0800 Subject: [PATCH] *: update golangci-lint version to fix ci Signed-off-by: mornyx --- Makefile | 2 +- config/config.go | 2 +- config/config_test.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a0a78d6..6bc995c 100644 --- a/Makefile +++ b/Makefile @@ -34,4 +34,4 @@ lint: tools/bin/golangci-lint GO111MODULE=on tools/bin/golangci-lint run -v $$($(PACKAGE_DIRECTORIES)) --config .golangci.yml tools/bin/golangci-lint: - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ./tools/bin v1.51.1 + curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ./tools/bin v1.55.2 diff --git a/config/config.go b/config/config.go index 858adf0..a507859 100644 --- a/config/config.go +++ b/config/config.go @@ -24,7 +24,7 @@ import ( ) const ( - DefProfilingEnable = false // TODO(mornyx): Enable when tiflash#5687 is fixed. + DefProfilingEnable = false // TODO(mornyx): Enable when tiflash#5285 is fixed. DefProfilingIntervalSeconds = 60 DefProfileSeconds = 10 DefProfilingTimeoutSeconds = 120 diff --git a/config/config_test.go b/config/config_test.go index d4101d6..0caa607 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -85,7 +85,7 @@ key-path = "ngm.key"` require.NotNil(t, cfg) data, err := json.Marshal(cfg) require.NoError(t, err) - // TODO(mornyx): Rollback when tiflash#5687 is fixed. + // TODO(mornyx): Rollback when tiflash#5285 is fixed. require.Equal(t, `{"address":"0.0.0.0:12020","advertise_address":"10.0.1.8:12020","pd":{"endpoints":["10.0.1.8:2379"]},"log":{"path":"log","level":"INFO"},"storage":{"path":"data"},"continuous_profiling":{"enable":false,"profile_seconds":10,"interval_seconds":60,"timeout_seconds":120,"data_retention_seconds":259200},"security":{"ca_path":"ngm.ca","cert_path":"ngm.cert","key_path":"ngm.key"},"tsdb":{"retention_period":"1","search_max_unique_timeseries":300000}}`, string(data)) ctx, cancel := context.WithCancel(context.Background()) @@ -113,7 +113,7 @@ path = "data1"` require.Equal(t, getCfg(), globalCfg) data, err = json.Marshal(globalCfg) require.NoError(t, err) - // TODO(mornyx): Rollback when tiflash#5687 is fixed. + // TODO(mornyx): Rollback when tiflash#5285 is fixed. require.Equal(t, `{"address":"0.0.0.0:12020","advertise_address":"10.0.1.8:12020","pd":{"endpoints":["10.0.1.8:2378","10.0.1.9:2379"]},"log":{"path":"log","level":"INFO"},"storage":{"path":"data"},"continuous_profiling":{"enable":false,"profile_seconds":10,"interval_seconds":60,"timeout_seconds":120,"data_retention_seconds":259200},"security":{"ca_path":"ngm.ca","cert_path":"ngm.cert","key_path":"ngm.key"},"tsdb":{"retention_period":"1","search_max_unique_timeseries":300000}}`, string(data)) cfgData = `` @@ -124,7 +124,7 @@ path = "data1"` time.Sleep(time.Millisecond * 10) data, err = json.Marshal(GetGlobalConfig()) require.NoError(t, err) - // TODO(mornyx): Rollback when tiflash#5687 is fixed. + // TODO(mornyx): Rollback when tiflash#5285 is fixed. require.Equal(t, `{"address":"0.0.0.0:12020","advertise_address":"10.0.1.8:12020","pd":{"endpoints":["10.0.1.8:2378","10.0.1.9:2379"]},"log":{"path":"log","level":"INFO"},"storage":{"path":"data"},"continuous_profiling":{"enable":false,"profile_seconds":10,"interval_seconds":60,"timeout_seconds":120,"data_retention_seconds":259200},"security":{"ca_path":"ngm.ca","cert_path":"ngm.cert","key_path":"ngm.key"},"tsdb":{"retention_period":"1","search_max_unique_timeseries":300000}}`, string(data)) }