From 89dd114f131473ade3c44a20a56582f260e5516d Mon Sep 17 00:00:00 2001 From: Unlock Music Dev Date: Wed, 24 Apr 2024 16:13:46 +0800 Subject: [PATCH] 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