diff --git a/.drone.yml b/.drone.yml index 7c3e425..581e5be 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,6 +11,8 @@ steps: - name: release image: golang:latest environment: + BUILDRONE_KEY: + from_secret: BUILDRONE_KEY GITHUB_TOKEN: from_secret: github_token commands: @@ -49,6 +51,8 @@ steps: - /root/.ssh/docker-build:/root/drone_rsa key_path: /root/drone_rsa command_timeout: 50m + envs: + - BUILDRONE_KEY script: - /mnt/buildx/jfa-go/build.sh stable - wget https://builds.hrfee.pw/upload.py @@ -112,6 +116,8 @@ steps: from_secret: ssh2_port volumes: - /root/.ssh/docker-build:/root/drone_rsa + envs: + - BUILDRONE_KEY key_path: /root/drone_rsa command_timeout: 50m script: diff --git a/.goreleaser.yml b/.goreleaser.yml index d6e0af5..1d3632d 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -31,7 +31,7 @@ builds: env: - CGO_ENABLED=0 ldflags: - - -s -w -X main.version={{.Env.VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary + - -s -w -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary goos: - linux - windows diff --git a/go.mod b/go.mod index 43176f9..7161429 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/writeas/go-strip-markdown v2.0.1+incompatible golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 // indirect golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect - golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 // indirect + golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b // indirect golang.org/x/tools v0.1.0 // indirect google.golang.org/protobuf v1.25.0 // indirect gopkg.in/ini.v1 v1.62.0 diff --git a/go.sum b/go.sum index ffe1e48..8d54574 100644 --- a/go.sum +++ b/go.sum @@ -301,6 +301,8 @@ golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43 h1:SgQ6LNaYJU0JIuEHv9+s6EbhS golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 h1:cEhElsAv9LUt9ZUUocxzWe05oFLVd+AA2nstydTeI8g= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b h1:ggRgirZABFolTmi3sn6Ivd9SipZwLedQ5wR0aAKnFxU= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/goreleaser b/goreleaser new file mode 100755 index 0000000..043e917 --- /dev/null +++ b/goreleaser @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +TAR_FILE="/tmp/goreleaser.tar.gz" +RELEASES_URL="https://github.com/goreleaser/goreleaser/releases" +test -z "$TMPDIR" && TMPDIR="$(mktemp -d)" + +last_version() { + curl -sL -o /dev/null -w %{url_effective} "$RELEASES_URL/latest" | + rev | + cut -f1 -d'/'| + rev +} + +download() { + test -z "$VERSION" && VERSION="$(last_version)" + test -z "$VERSION" && { + echo "Unable to get goreleaser version." >&2 + exit 1 + } + rm -f "$TAR_FILE" + curl -s -L -o "$TAR_FILE" \ + "$RELEASES_URL/download/$VERSION/goreleaser_$(uname -s)_$(uname -m).tar.gz" +} + +download +tar -xf "$TAR_FILE" -C "$TMPDIR" +"${TMPDIR}/goreleaser" "$@" diff --git a/scripts/version.sh b/scripts/version.sh index 890320e..d9d54c9 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,3 +1,3 @@ #!/bin/bash -VERSION=$(git describe --exact-match HEAD 2> /dev/null || echo 'vgit') -VERSION="$(echo $VERSION | sed 's/v//g')" $@ +JFA_GO_VERSION=$(git describe --exact-match HEAD 2> /dev/null || echo 'vgit') +JFA_GO_VERSION="$(echo $JFA_GO_VERSION | sed 's/v//g')" $@