From 1ae4b50bdc4a7f77dd8bcb19d5af74fce3202098 Mon Sep 17 00:00:00 2001 From: Jochen Hiller Date: Wed, 17 Mar 2021 16:35:12 +0100 Subject: [PATCH 1/3] Added Go module system, updated dependencies, added GOOS/GOARCH and Go version to kurly --version --- go.mod | 11 +++++++++++ go.sum | 17 +++++++++++++++++ main.go | 5 ++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 go.mod create mode 100644 go.sum diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..43e8e96 --- /dev/null +++ b/go.mod @@ -0,0 +1,11 @@ +module gitlab.com/davidjpeacock/kurly + +go 1.7 + +require ( + github.com/aki237/nscjar v0.0.0-20171019063319-e2df936ddd60 + github.com/alsm/ioprogress v0.0.0-20170412085706-063c3725f436 + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/urfave/cli v1.22.5 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..931a800 --- /dev/null +++ b/go.sum @@ -0,0 +1,17 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/aki237/nscjar v0.0.0-20171019063319-e2df936ddd60 h1:R/P/XxZB4D5+bOec/K7UIsFtmiTAkkwLaCFlGXOCOHk= +github.com/aki237/nscjar v0.0.0-20171019063319-e2df936ddd60/go.mod h1:/5xLNr1AJnh13R24iblBoT7G02mAXMedKoc8P0yuoyg= +github.com/alsm/ioprogress v0.0.0-20170412085706-063c3725f436 h1:g07ZYDEx4z5uTg7t5pXz6qYh9m225hMD9+5VpnMiqaU= +github.com/alsm/ioprogress v0.0.0-20170412085706-063c3725f436/go.mod h1:p8kTspFqDyAHQd/MFIvlHkxQr035+rjA1iTI7HELDAU= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +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/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU= +github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/main.go b/main.go index 8dddf49..10702db 100644 --- a/main.go +++ b/main.go @@ -15,6 +15,7 @@ import ( "net/url" "os" "path/filepath" + "runtime" "strconv" "strings" "time" @@ -59,7 +60,9 @@ func main() { app := cli.NewApp() app.Name = "kurly" app.Usage = "[options] URL" - app.Version = version + app.Version = version + + " (" + runtime.GOOS + "/" + runtime.GOARCH + ", " + + runtime.Version() + ")" opts.getOptions(app) -- GitLab From 1689eec5005092bd59d1a48d21d24fffee8cc49c Mon Sep 17 00:00:00 2001 From: Jochen Hiller Date: Wed, 17 Mar 2021 16:47:06 +0100 Subject: [PATCH 2/3] Improved build process, added platforms linux/mips, darwin/arm64 --- .gitignore | 2 ++ README.md | 2 ++ build/build.sh | 22 +++++++++++++++++----- 3 files changed, 21 insertions(+), 5 deletions(-) mode change 100644 => 100755 build/build.sh diff --git a/.gitignore b/.gitignore index 7fe53e1..56ce43f 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,5 @@ Temporary Items .apdisk # End of https://www.gitignore.io/api/go,osx,linux + +artifacts \ No newline at end of file diff --git a/README.md b/README.md index 51cdc68..590a24f 100644 --- a/README.md +++ b/README.md @@ -40,9 +40,11 @@ PR this section.* Binaries are provided for the following platforms: * [Mac OS X amd64](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/darwin-amd64/kurly-darwin-amd64.tar.gz?job=compile) +* [Mac OS X arm64](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/darwin-arm64/kurly-darwin-arm64.tar.gz?job=compile) * [Windows amd64](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/windows-amd64/kurly-windows-amd64.zip?job=compile) * [Linux amd64](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/linux-amd64/kurly-linux-amd64.tar.gz?job=compile) * [Linux arm](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/linux-arm/kurly-linux-arm.tar.gz?job=compile) +* [Linux mips](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/linux-mips/kurly-linux-mips.tar.gz?job=compile) * [FreeBSD amd64](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/freebsd-amd64/kurly-freebsd-amd64.tar.gz?job=compile) * [FreeBSD arm](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/freebsd-arm/kurly-freebsd-arm.tar.gz?job=compile) * [OpenBSD amd64](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/openbsd-amd64/kurly-openbsd-amd64.tar.gz?job=compile) diff --git a/build/build.sh b/build/build.sh old mode 100644 new mode 100755 index 83e32c5..d3182f9 --- a/build/build.sh +++ b/build/build.sh @@ -2,20 +2,32 @@ # script taken from https://gist.github.com/mshafiee/5a681bbefda8f26f1f257d62f5e4a699 - +if [ "${1}" == "" -o "${2}" == "" ] ; then + echo "Usage: build.sh " + echo " " + echo "Sample: ./build/build.sh kurly ." + echo " " + exit 1 +fi BIN_FILE_NAME_PREFIX=$1 PROJECT_DIR=$2 -PLATFORMS="linux/amd64 linux/arm \ - darwin/amd64 \ +PLATFORMS="linux/amd64 linux/arm linux/mips \ + darwin/amd64 darwin/arm64 \ freebsd/amd64 freebsd/arm \ netbsd/amd64 netbsd/arm \ openbsd/amd64 openbsd/arm \ windows/amd64" -apt update -apt install -y zip +# do not package update when running on macOS +if [[ ! ${OSTYPE} == *darwin* ]] ; then + apt update + apt install -y zip +fi +# run tests first +go test + for PLATFORM in $PLATFORMS; do GOOS=${PLATFORM%/*} GOARCH=${PLATFORM#*/} -- GitLab From 7c8d5e6c9403160672c4414c8302c1cd75b77968 Mon Sep 17 00:00:00 2001 From: Jochen Hiller Date: Thu, 22 Jul 2021 12:47:22 +0200 Subject: [PATCH 3/3] Added Linux 386 as platform --- README.md | 1 + build/build.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 590a24f..5b466ac 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ Binaries are provided for the following platforms: * [Mac OS X arm64](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/darwin-arm64/kurly-darwin-arm64.tar.gz?job=compile) * [Windows amd64](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/windows-amd64/kurly-windows-amd64.zip?job=compile) * [Linux amd64](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/linux-amd64/kurly-linux-amd64.tar.gz?job=compile) +* [Linux 386](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/linux-386/kurly-linux-386.tar.gz?job=compile) * [Linux arm](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/linux-arm/kurly-linux-arm.tar.gz?job=compile) * [Linux mips](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/linux-mips/kurly-linux-mips.tar.gz?job=compile) * [FreeBSD amd64](https://gitlab.com/davidjpeacock/kurly/-/jobs/artifacts/master/raw/artifacts/freebsd-amd64/kurly-freebsd-amd64.tar.gz?job=compile) diff --git a/build/build.sh b/build/build.sh index d3182f9..3b7abed 100755 --- a/build/build.sh +++ b/build/build.sh @@ -12,7 +12,7 @@ fi BIN_FILE_NAME_PREFIX=$1 PROJECT_DIR=$2 -PLATFORMS="linux/amd64 linux/arm linux/mips \ +PLATFORMS="linux/amd64 linux/arm linux/mips linux/386 \ darwin/amd64 darwin/arm64 \ freebsd/amd64 freebsd/arm \ netbsd/amd64 netbsd/arm \ -- GitLab