From 739d486b09cadd60793733541834265e0a56bde1 Mon Sep 17 00:00:00 2001 From: xuthus5 Date: Thu, 20 Aug 2020 22:14:31 +0800 Subject: [PATCH 1/2] add:go-cqhttp_version --- build.sh | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++ coolq/api.go | 16 ++++--- 2 files changed, 140 insertions(+), 6 deletions(-) create mode 100644 build.sh diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..7bc1ae1 --- /dev/null +++ b/build.sh @@ -0,0 +1,130 @@ +#!/usr/bin/env bash +# +# automatically generated in linux environment +# +# automatically generate version information: +# go build -ldflags "-X path.varname=varvalue" -o filename . +# +# shell use e.g: +# ./build.sh v1.0.0 +# /get_version_info => version:v1.0.0 +# +# all comb to compile +# $GOOS $GOARCH +# android arm +# darwin 386 +# darwin amd64 +# darwin arm +# darwin arm64 +# dragonfly amd64 +# freebsd 386 +# freebsd amd64 +# freebsd arm +# linux 386 +# linux amd64 +# linux arm +# linux arm64 +# linux ppc64 +# linux ppc64le +# linux mips +# linux mipsle +# linux mips64 +# linux mips64le +# netbsd 386 +# netbsd amd64 +# netbsd arm +# openbsd 386 +# openbsd amd64 +# openbsd arm +# plan9 386 +# plan9 amd64 +# solaris amd64 +# windows 386 +# windows amd64 + +function build_linux32() { + export GOOS=linux + export GOARCH=386 + filename=go-cqhttp-"$1"-linux-386 + go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o "$filename" . + tar zcvf "$filename".tar.gz "$filename" --remove-files + md5sum "$filename".tar.gz > "$filename".tar.gz.md5 + mv "$filename".tar.gz ./dist + mv "$filename".tar.gz.md5 ./dist +} + +function build_linux64() { + export GOOS=linux + export GOARCH=amd64 + filename=go-cqhttp-"$1"-linux-amd64 + go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o "$filename" . + tar zcvf "$filename".tar.gz "$filename" --remove-files + md5sum "$filename".tar.gz > "$filename".tar.gz.md5 + mv "$filename".tar.gz ./dist + mv "$filename".tar.gz.md5 ./dist +} + +function build_win32() { + export GOOS=windows + export GOARCH=386 + filename=go-cqhttp-"$1"-windows-386 + go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o "$filename" . + tar zcvf "$filename".tar.gz "$filename" --remove-files + md5sum "$filename".tar.gz > "$filename".tar.gz.md5 + mv "$filename".tar.gz ./dist + mv "$filename".tar.gz.md5 ./dist +} + +function build_win64() { + export GOOS=windows + export GOARCH=amd64 + filename=go-cqhttp-"$1"-windows-amd64 + go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o "$filename" . + tar zcvf "$filename".tar.gz "$filename" + md5sum "$filename".tar.gz > "$filename".tar.gz.md5 + mv "$filename".tar.gz ./dist + mv "$filename".tar.gz.md5 ./dist +} + +function build_darwin32() { + export GOOS=darwin + export GOARCH=386 + filename=go-cqhttp-"$1"-darwin-386 + go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o go-cqhttp-"$1"-darwin-386 . + tar zcvf "$filename".tar.gz "$filename" --remove-files + md5sum "$filename".tar.gz > "$filename".tar.gz.md5 + mv "$filename".tar.gz ./dist + mv "$filename".tar.gz.md5 ./dist +} + +function build_darwin64() { + export GOOS=darwin + export GOARCH=amd64 + filename=go-cqhttp-"$1"-darwin-amd64 + go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o go-cqhttp-"$1"-darwin-amd64 . + tar zcvf "$filename".tar.gz "$filename" --remove-files + md5sum "$filename".tar.gz > "$filename".tar.gz.md5 + mv "$filename".tar.gz ./dist + mv "$filename".tar.gz.md5 ./dist +} + +function main() { + if [ ! -d 'dist' ];then + mkdir dist + fi + + #build_linux32 $1 + build_linux64 $1 + #build_win32 $1 + #build_win64 $1 + #build_darwin32 $1 + #build_darwin64 $1 + +} + + +if [ -n "$1" ]; then + main $1 +else + echo "No version info input...exit!" +fi \ No newline at end of file diff --git a/coolq/api.go b/coolq/api.go index d49313e..17c9e25 100644 --- a/coolq/api.go +++ b/coolq/api.go @@ -1,20 +1,23 @@ package coolq import ( - "github.com/Mrs4s/MiraiGo/binary" - "github.com/Mrs4s/MiraiGo/client" - "github.com/Mrs4s/MiraiGo/message" - "github.com/Mrs4s/go-cqhttp/global" - log "github.com/sirupsen/logrus" - "github.com/tidwall/gjson" "io/ioutil" "os" "path" "runtime" "strconv" "time" + + "github.com/Mrs4s/MiraiGo/binary" + "github.com/Mrs4s/MiraiGo/client" + "github.com/Mrs4s/MiraiGo/message" + "github.com/Mrs4s/go-cqhttp/global" + log "github.com/sirupsen/logrus" + "github.com/tidwall/gjson" ) +var version = "unknown" + // https://cqhttp.cc/docs/4.15/#/API?id=get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF func (bot *CQBot) CQGetLoginInfo() MSG { return OK(MSG{"user_id": bot.Client.Uin, "nickname": bot.Client.Nickname}) @@ -578,6 +581,7 @@ func (bot *CQBot) CQGetVersionInfo() MSG { "plugin_build_configuration": "release", "runtime_version": runtime.Version(), "runtime_os": runtime.GOOS, + "version": version, }) } From 5ec4e3331d74a6b0e80da3d3229e71bf81e11f1a Mon Sep 17 00:00:00 2001 From: xuthus5 Date: Fri, 21 Aug 2020 00:50:45 +0800 Subject: [PATCH 2/2] fix:action --- .github/workflows/release.yml | 5 +- build.sh | 130 ---------------------------------- 2 files changed, 4 insertions(+), 131 deletions(-) delete mode 100644 build.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e67cffa..888004f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,6 +17,8 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set RELEASE_VERSION env + run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF:10} - uses: wangyoucao577/go-release-action@master env: CGO_ENABLED: 0 @@ -24,4 +26,5 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} - ldflags: "-w -s" + ldflags: -w -s -X "github.com/Mrs4s/go-cqhttp/coolq.version=${{ env.RELEASE_VERSION }}" + \ No newline at end of file diff --git a/build.sh b/build.sh deleted file mode 100644 index 7bc1ae1..0000000 --- a/build.sh +++ /dev/null @@ -1,130 +0,0 @@ -#!/usr/bin/env bash -# -# automatically generated in linux environment -# -# automatically generate version information: -# go build -ldflags "-X path.varname=varvalue" -o filename . -# -# shell use e.g: -# ./build.sh v1.0.0 -# /get_version_info => version:v1.0.0 -# -# all comb to compile -# $GOOS $GOARCH -# android arm -# darwin 386 -# darwin amd64 -# darwin arm -# darwin arm64 -# dragonfly amd64 -# freebsd 386 -# freebsd amd64 -# freebsd arm -# linux 386 -# linux amd64 -# linux arm -# linux arm64 -# linux ppc64 -# linux ppc64le -# linux mips -# linux mipsle -# linux mips64 -# linux mips64le -# netbsd 386 -# netbsd amd64 -# netbsd arm -# openbsd 386 -# openbsd amd64 -# openbsd arm -# plan9 386 -# plan9 amd64 -# solaris amd64 -# windows 386 -# windows amd64 - -function build_linux32() { - export GOOS=linux - export GOARCH=386 - filename=go-cqhttp-"$1"-linux-386 - go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o "$filename" . - tar zcvf "$filename".tar.gz "$filename" --remove-files - md5sum "$filename".tar.gz > "$filename".tar.gz.md5 - mv "$filename".tar.gz ./dist - mv "$filename".tar.gz.md5 ./dist -} - -function build_linux64() { - export GOOS=linux - export GOARCH=amd64 - filename=go-cqhttp-"$1"-linux-amd64 - go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o "$filename" . - tar zcvf "$filename".tar.gz "$filename" --remove-files - md5sum "$filename".tar.gz > "$filename".tar.gz.md5 - mv "$filename".tar.gz ./dist - mv "$filename".tar.gz.md5 ./dist -} - -function build_win32() { - export GOOS=windows - export GOARCH=386 - filename=go-cqhttp-"$1"-windows-386 - go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o "$filename" . - tar zcvf "$filename".tar.gz "$filename" --remove-files - md5sum "$filename".tar.gz > "$filename".tar.gz.md5 - mv "$filename".tar.gz ./dist - mv "$filename".tar.gz.md5 ./dist -} - -function build_win64() { - export GOOS=windows - export GOARCH=amd64 - filename=go-cqhttp-"$1"-windows-amd64 - go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o "$filename" . - tar zcvf "$filename".tar.gz "$filename" - md5sum "$filename".tar.gz > "$filename".tar.gz.md5 - mv "$filename".tar.gz ./dist - mv "$filename".tar.gz.md5 ./dist -} - -function build_darwin32() { - export GOOS=darwin - export GOARCH=386 - filename=go-cqhttp-"$1"-darwin-386 - go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o go-cqhttp-"$1"-darwin-386 . - tar zcvf "$filename".tar.gz "$filename" --remove-files - md5sum "$filename".tar.gz > "$filename".tar.gz.md5 - mv "$filename".tar.gz ./dist - mv "$filename".tar.gz.md5 ./dist -} - -function build_darwin64() { - export GOOS=darwin - export GOARCH=amd64 - filename=go-cqhttp-"$1"-darwin-amd64 - go build -ldflags "-X github.com/Mrs4s/go-cqhttp/coolq.version=$1" -o go-cqhttp-"$1"-darwin-amd64 . - tar zcvf "$filename".tar.gz "$filename" --remove-files - md5sum "$filename".tar.gz > "$filename".tar.gz.md5 - mv "$filename".tar.gz ./dist - mv "$filename".tar.gz.md5 ./dist -} - -function main() { - if [ ! -d 'dist' ];then - mkdir dist - fi - - #build_linux32 $1 - build_linux64 $1 - #build_win32 $1 - #build_win64 $1 - #build_darwin32 $1 - #build_darwin64 $1 - -} - - -if [ -n "$1" ]; then - main $1 -else - echo "No version info input...exit!" -fi \ No newline at end of file