From 3f6566f7a9e1f258f37f15008c61a54a158c6a85 Mon Sep 17 00:00:00 2001 From: Unlock Music Dev Date: Wed, 24 Apr 2024 16:13:46 +0800 Subject: [PATCH 1/4] build: fix ci --- .drone.jsonnet | 15 +++++++++++---- .drone.yml | 44 +++++++++++++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 4c97a33..9f0c3b0 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -20,10 +20,11 @@ local StepGoBuild(GOOS, GOARCH) = { local filepath = 'dist/um-%s-%s.tar.gz' % [GOOS, GOARCH], name: 'go build %s/%s' % [GOOS, GOARCH], - image: 'golang:1.19', + image: 'golang:1.22', environment: { GOOS: GOOS, GOARCH: GOARCH, + GOPROXY: "https://proxy.golang.org,https://goproxy.io,direct", }, commands: [ 'DIST_DIR=$(mktemp -d)', @@ -39,7 +40,7 @@ local StepUploadArtifact(GOOS, GOARCH) = { local pkgname = '${DRONE_REPO_NAME}-build', name: 'upload artifact', - image: 'golang:1.19', // reuse golang:1.19 for curl + image: 'golang:1.22', // reuse golang:1.19 for curl environment: { DRONE_GITEA_SERVER: 'https://git.unlock-music.dev', GITEA_API_KEY: { from_secret: 'GITEA_API_KEY' }, @@ -68,7 +69,10 @@ local PipelineBuild(GOOS, GOARCH, RUN_TEST) = { ( if RUN_TEST then [{ name: 'go test', - image: 'golang:1.19', + image: 'golang:1.22', + environment: { + GOPROXY: "https://proxy.golang.org,https://goproxy.io,direct", + }, commands: ['go test -v ./...'], }] else [] ) @@ -94,7 +98,10 @@ local PipelineRelease() = { }, { name: 'go test', - image: 'golang:1.19', + image: 'golang:1.22', + environment: { + GOPROXY: "https://proxy.golang.org,https://goproxy.io,direct", + }, commands: ['go test -v ./...'], }, StepGoBuild('linux', 'amd64'), diff --git a/.drone.yml b/.drone.yml index f0ffa1a..960664f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,9 @@ steps: name: fetch tags - commands: - go test -v ./... - image: golang:1.19 + environment: + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go test - commands: - DIST_DIR=$(mktemp -d) @@ -19,7 +21,8 @@ steps: environment: GOARCH: amd64 GOOS: linux - image: golang:1.19 + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go build linux/amd64 - commands: - curl --fail --include --user "um-release-bot:$GITEA_API_KEY" --upload-file "dist/um-linux-amd64.tar.gz" @@ -30,7 +33,7 @@ steps: DRONE_GITEA_SERVER: https://git.unlock-music.dev GITEA_API_KEY: from_secret: GITEA_API_KEY - image: golang:1.19 + image: golang:1.22 name: upload artifact trigger: event: @@ -54,7 +57,8 @@ steps: environment: GOARCH: amd64 GOOS: windows - image: golang:1.19 + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go build windows/amd64 - commands: - curl --fail --include --user "um-release-bot:$GITEA_API_KEY" --upload-file "dist/um-windows-amd64.tar.gz" @@ -65,7 +69,7 @@ steps: DRONE_GITEA_SERVER: https://git.unlock-music.dev GITEA_API_KEY: from_secret: GITEA_API_KEY - image: golang:1.19 + image: golang:1.22 name: upload artifact trigger: event: @@ -89,7 +93,8 @@ steps: environment: GOARCH: amd64 GOOS: darwin - image: golang:1.19 + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go build darwin/amd64 - commands: - curl --fail --include --user "um-release-bot:$GITEA_API_KEY" --upload-file "dist/um-darwin-amd64.tar.gz" @@ -100,7 +105,7 @@ steps: DRONE_GITEA_SERVER: https://git.unlock-music.dev GITEA_API_KEY: from_secret: GITEA_API_KEY - image: golang:1.19 + image: golang:1.22 name: upload artifact trigger: event: @@ -117,7 +122,9 @@ steps: name: fetch tags - commands: - go test -v ./... - image: golang:1.19 + environment: + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go test - commands: - DIST_DIR=$(mktemp -d) @@ -128,7 +135,8 @@ steps: environment: GOARCH: amd64 GOOS: linux - image: golang:1.19 + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go build linux/amd64 - commands: - DIST_DIR=$(mktemp -d) @@ -139,7 +147,8 @@ steps: environment: GOARCH: arm64 GOOS: linux - image: golang:1.19 + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go build linux/arm64 - commands: - DIST_DIR=$(mktemp -d) @@ -150,7 +159,8 @@ steps: environment: GOARCH: "386" GOOS: linux - image: golang:1.19 + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go build linux/386 - commands: - DIST_DIR=$(mktemp -d) @@ -161,7 +171,8 @@ steps: environment: GOARCH: amd64 GOOS: windows - image: golang:1.19 + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go build windows/amd64 - commands: - DIST_DIR=$(mktemp -d) @@ -172,7 +183,8 @@ steps: environment: GOARCH: "386" GOOS: windows - image: golang:1.19 + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go build windows/386 - commands: - DIST_DIR=$(mktemp -d) @@ -183,7 +195,8 @@ steps: environment: GOARCH: amd64 GOOS: darwin - image: golang:1.19 + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go build darwin/amd64 - commands: - DIST_DIR=$(mktemp -d) @@ -194,7 +207,8 @@ steps: environment: GOARCH: arm64 GOOS: darwin - image: golang:1.19 + GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + image: golang:1.22 name: go build darwin/arm64 - image: plugins/gitea-release name: create release From bda32bc53e4ef3f54ca4ae62b5797ea63799bd85 Mon Sep 17 00:00:00 2001 From: Unlock Music Dev Date: Wed, 24 Apr 2024 17:05:03 +0800 Subject: [PATCH 2/4] chore: update deps --- go.mod | 34 ++++++++++----------- go.sum | 95 +++++++++++++++++++++------------------------------------- 2 files changed, 50 insertions(+), 79 deletions(-) diff --git a/go.mod b/go.mod index 7362c01..e2878bb 100644 --- a/go.mod +++ b/go.mod @@ -3,26 +3,24 @@ module unlock-music.dev/cli go 1.19 require ( - github.com/fsnotify/fsnotify v1.6.0 - github.com/go-flac/flacpicture v0.2.0 - github.com/go-flac/flacvorbis v0.1.0 - github.com/go-flac/go-flac v0.3.1 - github.com/samber/lo v1.36.0 - github.com/urfave/cli/v2 v2.23.6 - go.uber.org/zap v1.24.0 - golang.org/x/crypto v0.3.0 - golang.org/x/exp v0.0.0-20221205204356-47842c84f3db - golang.org/x/text v0.5.0 - unlock-music.dev/mmkv v0.0.0-20221204231432-41a75bd29939 + github.com/fsnotify/fsnotify v1.7.0 + github.com/go-flac/flacpicture v0.3.0 + github.com/go-flac/flacvorbis v0.2.0 + github.com/go-flac/go-flac v1.0.0 + github.com/samber/lo v1.39.0 + github.com/urfave/cli/v2 v2.27.1 + go.uber.org/zap v1.27.0 + golang.org/x/crypto v0.22.0 + golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f + golang.org/x/text v0.14.0 + unlock-music.dev/mmkv v0.0.0-20240424085824-59457ccfa008 ) require ( - github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect - go.uber.org/atomic v1.10.0 // indirect - go.uber.org/multierr v1.8.0 // indirect - golang.org/x/sys v0.2.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect + github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/sys v0.19.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/go.sum b/go.sum index 2a3652f..01fa5bd 100644 --- a/go.sum +++ b/go.sum @@ -1,66 +1,39 @@ -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/ddliu/go-httpclient v0.5.1 h1:ys4KozrhBaGdI1yuWIFwNNILqhnMU9ozTvRNfCTorvs= -github.com/ddliu/go-httpclient v0.5.1/go.mod h1:8QVbjq00YK2f2MQyiKuWMdaKOFRcoD9VuubkNCNOuZo= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/go-flac/flacpicture v0.2.0 h1:rS/ZOR/ZxlEwMf3yOPFcTAmGyoV6rDtcYdd+6CwWQAw= -github.com/go-flac/flacpicture v0.2.0/go.mod h1:M4a1J0v6B5NHsck4GA1yZg0vFQzETVPd3kuj6Ow+q9o= -github.com/go-flac/flacvorbis v0.1.0 h1:xStJfPrZ/IoA2oBUEwgrlaSf+Opo6/YuQfkqVhkP0cM= -github.com/go-flac/flacvorbis v0.1.0/go.mod h1:70N9vVkQ4Jew0oBWkwqDMIE21h7pMUtQJpnMD0js6XY= -github.com/go-flac/go-flac v0.3.1 h1:BWA7HdO67S4ZLWSVHCxsDHuedFFu5RiV/wmuhvO6Hxo= -github.com/go-flac/go-flac v0.3.1/go.mod h1:jG9IumOfAXr+7J40x0AiQIbJzXf9Y7+Zs/2CNWe4LMk= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/go-flac/flacpicture v0.3.0 h1:LkmTxzFLIynwfhHiZsX0s8xcr3/u33MzvV89u+zOT8I= +github.com/go-flac/flacpicture v0.3.0/go.mod h1:DPbrzVYQ3fJcvSgLFp9HXIrEQEdfdk/+m0nQCzwodZI= +github.com/go-flac/flacvorbis v0.2.0 h1:KH0xjpkNTXFER4cszH4zeJxYcrHbUobz/RticWGOESs= +github.com/go-flac/flacvorbis v0.2.0/go.mod h1:uIysHOtuU7OLGoCRG92bvnkg7QEqHx19qKRV6K1pBrI= +github.com/go-flac/go-flac v1.0.0 h1:6qI9XOVLcO50xpzm3nXvO31BgDgHhnr/p/rER/K/doY= +github.com/go-flac/go-flac v1.0.0/go.mod h1:WnZhcpmq4u1UdZMNn9LYSoASpWOCMOoxXxcWEHSzkW8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/samber/lo v1.36.0 h1:4LaOxH1mHnbDGhTVE0i1z8v/lWaQW8AIfOD3HU4mSaw= -github.com/samber/lo v1.36.0/go.mod h1:HLeWcJRRyLKp3+/XBJvOrerCQn9mhdKMHyd7IRlgeQ8= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M= -github.com/urfave/cli/v2 v2.23.6 h1:iWmtKD+prGo1nKUtLO0Wg4z9esfBM4rAV4QRLQiEmJ4= -github.com/urfave/cli/v2 v2.23.6/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= -github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= -github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= -golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA= +github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho= +github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= +github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw= +github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= +golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -unlock-music.dev/mmkv v0.0.0-20221204231432-41a75bd29939 h1:qWv734RbYjIHtHhZSRbdSyAEJ5K1rWcPSuUOen86tvI= -unlock-music.dev/mmkv v0.0.0-20221204231432-41a75bd29939/go.mod h1:1+Hdsrk8gl1i4/oxOnAhx6y51DAcUfi2CDni6Qhk8Kw= +unlock-music.dev/mmkv v0.0.0-20240424085824-59457ccfa008 h1:MMdtazjijTQfBZBqJe6eeGiAXgKgi7He7zL4BMmHf1U= +unlock-music.dev/mmkv v0.0.0-20240424085824-59457ccfa008/go.mod h1:qr34SM3x8xRxyUfGzefH/rSi+DUXkQZcSfXY/yfuTeo= From 9c0acb794e7a3d5b6255b6185a9bc0a623adbf61 Mon Sep 17 00:00:00 2001 From: Unlock Music Dev Date: Wed, 24 Apr 2024 17:11:40 +0800 Subject: [PATCH 3/4] build: update ci settings --- .drone.jsonnet | 6 +++--- .drone.yml | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 9f0c3b0..a2bdfee 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -24,7 +24,7 @@ local StepGoBuild(GOOS, GOARCH) = { environment: { GOOS: GOOS, GOARCH: GOARCH, - GOPROXY: "https://proxy.golang.org,https://goproxy.io,direct", + GOPROXY: "https://goproxy.io,direct", }, commands: [ 'DIST_DIR=$(mktemp -d)', @@ -71,7 +71,7 @@ local PipelineBuild(GOOS, GOARCH, RUN_TEST) = { name: 'go test', image: 'golang:1.22', environment: { - GOPROXY: "https://proxy.golang.org,https://goproxy.io,direct", + GOPROXY: "https://goproxy.io,direct", }, commands: ['go test -v ./...'], }] else [] @@ -100,7 +100,7 @@ local PipelineRelease() = { name: 'go test', image: 'golang:1.22', environment: { - GOPROXY: "https://proxy.golang.org,https://goproxy.io,direct", + GOPROXY: "https://goproxy.io,direct", }, commands: ['go test -v ./...'], }, diff --git a/.drone.yml b/.drone.yml index 960664f..535660c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ steps: - commands: - go test -v ./... environment: - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go test - commands: @@ -21,7 +21,7 @@ steps: environment: GOARCH: amd64 GOOS: linux - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go build linux/amd64 - commands: @@ -57,7 +57,7 @@ steps: environment: GOARCH: amd64 GOOS: windows - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go build windows/amd64 - commands: @@ -93,7 +93,7 @@ steps: environment: GOARCH: amd64 GOOS: darwin - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go build darwin/amd64 - commands: @@ -123,7 +123,7 @@ steps: - commands: - go test -v ./... environment: - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go test - commands: @@ -135,7 +135,7 @@ steps: environment: GOARCH: amd64 GOOS: linux - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go build linux/amd64 - commands: @@ -147,7 +147,7 @@ steps: environment: GOARCH: arm64 GOOS: linux - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go build linux/arm64 - commands: @@ -159,7 +159,7 @@ steps: environment: GOARCH: "386" GOOS: linux - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go build linux/386 - commands: @@ -171,7 +171,7 @@ steps: environment: GOARCH: amd64 GOOS: windows - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go build windows/amd64 - commands: @@ -183,7 +183,7 @@ steps: environment: GOARCH: "386" GOOS: windows - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go build windows/386 - commands: @@ -195,7 +195,7 @@ steps: environment: GOARCH: amd64 GOOS: darwin - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go build darwin/amd64 - commands: @@ -207,7 +207,7 @@ steps: environment: GOARCH: arm64 GOOS: darwin - GOPROXY: https://proxy.golang.org,https://goproxy.io,direct + GOPROXY: https://goproxy.io,direct image: golang:1.22 name: go build darwin/arm64 - image: plugins/gitea-release From c9ed772ce0a2a35c0af228f8e1eabf5188ab9daa Mon Sep 17 00:00:00 2001 From: Unlock Music Dev Date: Wed, 24 Apr 2024 17:14:06 +0800 Subject: [PATCH 4/4] chore: update deps --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e2878bb..1ed12f5 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( golang.org/x/crypto v0.22.0 golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f golang.org/x/text v0.14.0 - unlock-music.dev/mmkv v0.0.0-20240424085824-59457ccfa008 + unlock-music.dev/mmkv v0.0.0-20240424090133-0953e6901f3a ) require ( diff --git a/go.sum b/go.sum index 01fa5bd..d61ecae 100644 --- a/go.sum +++ b/go.sum @@ -35,5 +35,5 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -unlock-music.dev/mmkv v0.0.0-20240424085824-59457ccfa008 h1:MMdtazjijTQfBZBqJe6eeGiAXgKgi7He7zL4BMmHf1U= -unlock-music.dev/mmkv v0.0.0-20240424085824-59457ccfa008/go.mod h1:qr34SM3x8xRxyUfGzefH/rSi+DUXkQZcSfXY/yfuTeo= +unlock-music.dev/mmkv v0.0.0-20240424090133-0953e6901f3a h1:UW0sxgwsfGGC/SrKvvAbZ4HZyOQ3fqs8qr3lBxG6Fzo= +unlock-music.dev/mmkv v0.0.0-20240424090133-0953e6901f3a/go.mod h1:qr34SM3x8xRxyUfGzefH/rSi+DUXkQZcSfXY/yfuTeo=