From ced9ab3e031dc99edc2242306d1dfada6cec3458 Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 21:19:40 +0800 Subject: [PATCH 01/13] Update Travis --- .travis.yml | 3 ++- scripts/build.sh | 22 ++++++++++++++++++++++ scripts/unix.sh | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 scripts/build.sh diff --git a/.travis.yml b/.travis.yml index 7865a1d..a716514 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ go: env: GO111MODULE=on -script: GOARCH=amd64 go build -o webp-server-linux-amd64 webp-server.go +script: + - sh scripts/build.sh deploy: provider: releases diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100644 index 0000000..f13af7f --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +CGO_ENABLED=0 + +GOOS=linux +GOARCH=amd64 +go build -x -v -ldflags "-s -w" -o builds/webp-server-linux-amd64 ../webp-server.go + +GOOS=linux +GOARCH=arm +go build -x -v -ldflags "-s -w" -o builds/webp-server-linux-arm ../webp-server.go + +GOOS=darwin +GOARCH=amd64 +go build -x -v -ldflags "-s -w" -o builds/webp-server-darwin-amd64 ../webp-server.go + +GOOS=windows +GOARCH=amd64 +go build -x -v -ldflags "-s -w" -o builds/webp-server-windows-amd64.exe ../webp-server.go + +echo "build done!" +ls builds \ No newline at end of file diff --git a/scripts/unix.sh b/scripts/unix.sh index bc68a03..c915834 100644 --- a/scripts/unix.sh +++ b/scripts/unix.sh @@ -9,5 +9,5 @@ then elif [[ $platform =~ "x86_64" ]];then go build -o webp-server-unix-amd64 webp-server.go else - go build -o webp-server-linux-i386 webp-server.go + go build -o webp-server-linux-amd64 webp-server.go fi From 95da3e81a4ebeb999c2770142a9825716366a766 Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 21:23:06 +0800 Subject: [PATCH 02/13] Adjust path --- scripts/build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index f13af7f..8faf509 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -4,19 +4,19 @@ CGO_ENABLED=0 GOOS=linux GOARCH=amd64 -go build -x -v -ldflags "-s -w" -o builds/webp-server-linux-amd64 ../webp-server.go +go build -x -v -ldflags "-s -w" -o builds/webp-server-linux-amd64 GOOS=linux GOARCH=arm -go build -x -v -ldflags "-s -w" -o builds/webp-server-linux-arm ../webp-server.go +go build -x -v -ldflags "-s -w" -o builds/webp-server-linux-arm GOOS=darwin GOARCH=amd64 -go build -x -v -ldflags "-s -w" -o builds/webp-server-darwin-amd64 ../webp-server.go +go build -x -v -ldflags "-s -w" -o builds/webp-server-darwin-amd64 GOOS=windows GOARCH=amd64 -go build -x -v -ldflags "-s -w" -o builds/webp-server-windows-amd64.exe ../webp-server.go +go build -x -v -ldflags "-s -w" -o builds/webp-server-windows-amd64.exe echo "build done!" -ls builds \ No newline at end of file +ls \ No newline at end of file From 19f403efb1b0a99677abef8ed648ccacf20f1962 Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 21:24:51 +0800 Subject: [PATCH 03/13] Adjust path --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 8faf509..0f8624e 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -19,4 +19,4 @@ GOARCH=amd64 go build -x -v -ldflags "-s -w" -o builds/webp-server-windows-amd64.exe echo "build done!" -ls \ No newline at end of file +ls builds \ No newline at end of file From b43e2a525fd8d1298da240a18efa03029377daa2 Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 21:45:11 +0800 Subject: [PATCH 04/13] test binary --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a716514..f593a42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,5 +16,5 @@ deploy: - webp-server-linux-amd64 on: repo: webp-sh/webp_server_go - tags: true - branch: master \ No newline at end of file + tags: false + branch: better-ci \ No newline at end of file From 97f9bbb4ed7b2ace52f6e728be1b9f357d56933e Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 21:50:36 +0800 Subject: [PATCH 05/13] test binary --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f593a42..d5c6231 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ deploy: provider: releases api_key: $GITHUB_OAUTH_TOKEN skip_cleanup: true - file: - - webp-server-linux-amd64 + file: builds/* on: repo: webp-sh/webp_server_go tags: false From 8d33ce1d9683ebf36a19e7c516ce5320520b57a0 Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 21:57:51 +0800 Subject: [PATCH 06/13] test deploy --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d5c6231..7ffea51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,9 @@ script: deploy: provider: releases api_key: $GITHUB_OAUTH_TOKEN - skip_cleanup: true + file_glob: true file: builds/* + skip_cleanup: true on: repo: webp-sh/webp_server_go tags: false From e399045bc76124a63901dcd96d9c352aa043d6e0 Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 22:10:25 +0800 Subject: [PATCH 07/13] Compile for multiple branch --- .travis.yml | 7 ++++++- scripts/build.sh | 16 +--------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ffea51..8f085bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,14 +3,19 @@ language: go go: - 1.13 +arch: + - amd64 + - arm64 + env: GO111MODULE=on script: - - sh scripts/build.sh + - sh scripts/build.sh $TRAVIS_CPU_ARCH deploy: provider: releases api_key: $GITHUB_OAUTH_TOKEN + name: $TRAVIS_TAG file_glob: true file: builds/* skip_cleanup: true diff --git a/scripts/build.sh b/scripts/build.sh index 0f8624e..4a33f6b 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,21 +2,7 @@ CGO_ENABLED=0 -GOOS=linux -GOARCH=amd64 -go build -x -v -ldflags "-s -w" -o builds/webp-server-linux-amd64 - -GOOS=linux -GOARCH=arm -go build -x -v -ldflags "-s -w" -o builds/webp-server-linux-arm - -GOOS=darwin -GOARCH=amd64 -go build -x -v -ldflags "-s -w" -o builds/webp-server-darwin-amd64 - -GOOS=windows -GOARCH=amd64 -go build -x -v -ldflags "-s -w" -o builds/webp-server-windows-amd64.exe +go build -x -v -ldflags "-s -w" -o builds/webp-server-linux-${1} echo "build done!" ls builds \ No newline at end of file From 98f4cddac80c866d754b274fc7595cd7111e9988 Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 22:12:18 +0800 Subject: [PATCH 08/13] Compile for multiple branch --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8f085bc..91740fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ script: deploy: provider: releases api_key: $GITHUB_OAUTH_TOKEN - name: $TRAVIS_TAG file_glob: true file: builds/* skip_cleanup: true From e9ff8fc50aea176aaa6956f8017c8f5d17715c16 Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 22:19:43 +0800 Subject: [PATCH 09/13] Better CI display --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 4a33f6b..8daea77 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,7 +2,7 @@ CGO_ENABLED=0 -go build -x -v -ldflags "-s -w" -o builds/webp-server-linux-${1} +go build -v -ldflags "-s -w" -o builds/webp-server-linux-${1} echo "build done!" ls builds \ No newline at end of file From 8c0ced21b506be4e8e4405a3897df3234165b2dd Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 22:27:56 +0800 Subject: [PATCH 10/13] Try different os --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 91740fd..d515d5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,13 @@ go: arch: - amd64 - arm64 + - ppc64le + - s390x + +os: + - windows + - osc + - linux env: GO111MODULE=on From 32f50c4306f331012b8b2186dcf128a3fe85fb77 Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 22:41:04 +0800 Subject: [PATCH 11/13] Correct filename --- .travis.yml | 2 +- scripts/build.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d515d5c..8b51453 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ os: env: GO111MODULE=on script: - - sh scripts/build.sh $TRAVIS_CPU_ARCH + - sh scripts/build.sh $TRAVIS_OS_NAME $TRAVIS_CPU_ARCH deploy: provider: releases diff --git a/scripts/build.sh b/scripts/build.sh index 8daea77..f004ec4 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,7 +2,12 @@ CGO_ENABLED=0 -go build -v -ldflags "-s -w" -o builds/webp-server-linux-${1} +if [ "${1}" == "windows" ] +then + go build -v -ldflags "-s -w" -o builds/webp-server-${1}-${2}.exe +else + go build -v -ldflags "-s -w" -o builds/webp-server-${1}-${2} +fi echo "build done!" ls builds \ No newline at end of file From e98e7be6901994a6a5e4005c93535bea3f645bda Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 22:43:25 +0800 Subject: [PATCH 12/13] Correct filename --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b51453..fa9b960 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,10 @@ arch: - amd64 - arm64 - ppc64le - - s390x os: - windows - - osc + - osx - linux env: GO111MODULE=on From 2890aa128a87f5aaaf974d04fed064ce9688c5ca Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Tue, 3 Mar 2020 23:10:08 +0800 Subject: [PATCH 13/13] bug fix --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa9b960..fb08ba4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,5 +26,5 @@ deploy: skip_cleanup: true on: repo: webp-sh/webp_server_go - tags: false - branch: better-ci \ No newline at end of file + tags: true + branch: master \ No newline at end of file