From add7e89097d838e98460fde32fb6b94585ef4ce6 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Mon, 19 Aug 2019 22:29:04 +1000 Subject: [PATCH 1/7] Update README.md --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 65b7cf28..ea3aab78 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,11 @@ CodeFactor CodeFactor + Awesome - + Pipelines

- The traditional method of providing web interfaces to Go programs is via a built-in web server. Wails offers a different approach: it provides the ability to wrap both Go code and a web frontend into a single binary. Tools are provided to make this easy for you by handling project creation, compilation and bundling. All you have to do is get creative! ## Features @@ -122,3 +122,6 @@ This project was mainly coded to the following albums: * [Maxthor - Another World](https://open.spotify.com/album/3tklE2Fgw1hCIUstIwPBJF) * [Alun Tan Lan - Y Distawrwydd](https://open.spotify.com/album/0c32OywcLpdJCWWMC6vB8v) +## Licensing + +[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_large) From 54b4b157b34628914d5dbe6920994cd5f6a21c01 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Mon, 19 Aug 2019 22:30:25 +1000 Subject: [PATCH 2/7] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ea3aab78..6695ae36 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,9 @@ Awesome - Pipelines + Pipelines

+ The traditional method of providing web interfaces to Go programs is via a built-in web server. Wails offers a different approach: it provides the ability to wrap both Go code and a web frontend into a single binary. Tools are provided to make this easy for you by handling project creation, compilation and bundling. All you have to do is get creative! ## Features From 1a82406d2b05bafd319375eca0e23ece22528be1 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Mon, 19 Aug 2019 22:53:05 +1000 Subject: [PATCH 3/7] build: add azure-pipelines script --- azure-pipelines.yaml | 138 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 azure-pipelines.yaml diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml new file mode 100644 index 00000000..2bf81411 --- /dev/null +++ b/azure-pipelines.yaml @@ -0,0 +1,138 @@ +# avoid double trigger by applying some rules +# start a pipeline when push to 'master' branch +trigger: +- master +# or when pull request on 'develop' branch +pr: +- develop + +# for now there is only one stage 'Build' +# in the future we could use multistage strategy for releases +stages: +- stage: Build + + # there are 3 jobs + # one for each os + jobs: + - deployment: Linux + displayName: Lin + variables: + GOPATH: '$(Agent.BuildDirectory)/gopath' # Go workspace path + GOROOT: '$(Agent.BuildDirectory)/go' # Go installation path + GOBIN: '$(GOPATH)/bin' # Go binaries path + GOMODULE: 'on' + modulePath: '$(Agent.BuildDirectory)/wails' # Path to the module's code + pool: + vmImage: 'Ubuntu-16.04' + environment: 'linux-dev' + strategy: + runOnce: + deploy: + steps: + - checkout: self # self represents the repo where the initial Pipelines YAML file was found + clean: true # whether to fetch clean each time + path: wails # path to check out source code, relative to the agent's build directory (e.g. \_work\1) + # go version 1.12.7 + - script: | + wget "https://storage.googleapis.com/golang/go1.12.7.linux-amd64.tar.gz" --output-document "$(Agent.BuildDirectory)/go1.12.7.tar.gz" + tar -C '$(Agent.BuildDirectory)' -xzf "$(Agent.BuildDirectory)/go1.12.7.tar.gz" + displayName: 'Install Go 1.12.7 Linux' + - script: | + mkdir -p '$(GOBIN)' + mkdir -p '$(GOPATH)/pkg' + mkdir -p '$(GOROOT)' + shopt -s extglob + shopt -s dotglob + echo '##vso[task.prependpath]$(GOBIN)' + echo '##vso[task.prependpath]$(GOROOT)/bin' + displayName: 'Set up the Go workspace' + - script: | + go version + go get -v -d ./... + cd cmd/wails + go install + workingDirectory: '$(modulePath)' + displayName: 'Get dependencies, then build' + - script: | + wails version + workingDirectory: '$(modulePath)' + displayName: 'Check we have output' + + - deployment: Mac + displayName: Mac + variables: + GOPATH: '$(Agent.BuildDirectory)/gopath' # Go workspace path + GOROOT: '$(Agent.BuildDirectory)/go' # Go installation path + GOBIN: '$(GOPATH)/bin' # Go binaries path + GOMODULE: 'on' + modulePath: '$(Agent.BuildDirectory)/wails' # Path to the module's code + pool: + vmImage: 'macOS-10.14' + environment: 'mac-dev' + strategy: + runOnce: + deploy: + steps: + - checkout: self # self represents the repo where the initial Pipelines YAML file was found + clean: true # whether to fetch clean each time + path: wails # path to check out source code, relative to the agent's build directory (e.g. \_work\1) + # go version 1.12.7 + - script: | + wget "https://storage.googleapis.com/golang/go1.12.7.darwin-amd64.tar.gz" --output-document "$(Agent.BuildDirectory)/go1.12.7.tar.gz" + tar -C '$(Agent.BuildDirectory)' -xzf "$(Agent.BuildDirectory)/go1.12.7.tar.gz" + displayName: 'Install Go 1.12.7 Linux' + - script: | + mkdir -p '$(GOBIN)' + mkdir -p '$(GOPATH)/pkg' + mkdir -p '$(GOROOT)' + shopt -s extglob + shopt -s dotglob + echo '##vso[task.prependpath]$(GOBIN)' + echo '##vso[task.prependpath]$(GOROOT)/bin' + displayName: 'Set up the Go workspace' + - script: | + go version + go get -v -d ./... + cd cmd/wails + go install + workingDirectory: '$(modulePath)' + displayName: 'Get dependencies, then build' + - script: | + wails version + workingDirectory: '$(modulePath)' + displayName: 'Check we have output' + + - deployment: Win + displayName: Win + variables: + GOMODULE: 'on' + modulePath: '$(Agent.BuildDirectory)/wails' # Path to the module's code + pool: + vmImage: 'windows-2019' + environment: 'win-dev' + strategy: + runOnce: + deploy: + steps: + - checkout: self # self represents the repo where the initial Pipelines YAML file was found + clean: true # whether to fetch clean each time + path: wails # path to check out source code, relative to the agent's build directory (e.g. \_work\1) + # Go tool installer + # Find in cache or download a specific version of Go and add it to the PATH + - task: GoTool@0 + inputs: + version: '1.12.7' + goPath: '$(Agent.BuildDirectory)/go' + goBin: '$(Agent.BuildDirectory)/go/bin' + displayName: 'Set up the Go workspace' + - script: | + go version + go get -v -d ./... + cd cmd/wails + go install + workingDirectory: '$(modulePath)' + displayName: 'Get dependencies, then build' + - script: | + wails version + workingDirectory: '$(Agent.BuildDirectory)/go/bin' + displayName: 'Check we have output' From 3d9e9a13423be73170152d857f994fd232d08956 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Mon, 19 Aug 2019 22:54:06 +1000 Subject: [PATCH 4/7] build: fix filename --- azure-pipelines.yaml => azure-pipelines.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename azure-pipelines.yaml => azure-pipelines.yml (100%) diff --git a/azure-pipelines.yaml b/azure-pipelines.yml similarity index 100% rename from azure-pipelines.yaml rename to azure-pipelines.yml From 718bb1b85285cbeddc11903052aa7c753b6412bf Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Tue, 3 Sep 2019 21:46:47 +1000 Subject: [PATCH 5/7] patch --- cmd/semver.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/semver.go b/cmd/semver.go index fffc06d7..db87e865 100644 --- a/cmd/semver.go +++ b/cmd/semver.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/masterminds/semver" + "github.com/Masterminds/semver" ) // SemanticVersion is a struct containing a semantic version @@ -18,7 +18,7 @@ func NewSemanticVersion(version string) (*SemanticVersion, error) { return nil, err } return &SemanticVersion{ - Version: semverVersion, + Version: &semverVersion, }, nil } From 099967ae9499c88e9e3a718b8cc11e4f3f26e812 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Tue, 3 Sep 2019 21:52:45 +1000 Subject: [PATCH 6/7] hotfix: semver changed api --- cmd/semver.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/semver.go b/cmd/semver.go index db87e865..f0046a65 100644 --- a/cmd/semver.go +++ b/cmd/semver.go @@ -8,7 +8,7 @@ import ( // SemanticVersion is a struct containing a semantic version type SemanticVersion struct { - Version *semver.Version + Version semver.Version } // NewSemanticVersion creates a new SemanticVersion object with the given version string @@ -18,7 +18,7 @@ func NewSemanticVersion(version string) (*SemanticVersion, error) { return nil, err } return &SemanticVersion{ - Version: &semverVersion, + Version: semverVersion, }, nil } From 694f80434a2346123eb0ed92cc53fc076c3ffe0a Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Thu, 5 Sep 2019 08:50:40 +1000 Subject: [PATCH 7/7] fix: revert fix Masterminds have fixed it upstream --- cmd/semver.go | 2 +- go.mod | 3 +-- go.sum | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmd/semver.go b/cmd/semver.go index f0046a65..277e3b5a 100644 --- a/cmd/semver.go +++ b/cmd/semver.go @@ -8,7 +8,7 @@ import ( // SemanticVersion is a struct containing a semantic version type SemanticVersion struct { - Version semver.Version + Version *semver.Version } // NewSemanticVersion creates a new SemanticVersion object with the given version string diff --git a/go.mod b/go.mod index aea1680b..840e155b 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/wailsapp/wails require ( - github.com/Masterminds/semver v1.4.2 // indirect + github.com/Masterminds/semver v1.4.2 github.com/dchest/cssmin v0.0.0-20151210170030-fb8d9b44afdc // indirect github.com/dchest/htmlmin v0.0.0-20150526090704-e254725e81ac github.com/dchest/jsmin v0.0.0-20160823214000-faeced883947 // indirect @@ -14,7 +14,6 @@ require ( github.com/leaanthony/mewn v0.10.7 github.com/leaanthony/slicer v1.3.2 github.com/leaanthony/spinner v0.5.3 - github.com/masterminds/semver v1.4.2 github.com/mattn/go-colorable v0.1.1 // indirect github.com/mattn/go-isatty v0.0.7 // indirect github.com/mitchellh/go-homedir v1.1.0 diff --git a/go.sum b/go.sum index e00144b9..7bc5b40a 100644 --- a/go.sum +++ b/go.sum @@ -41,8 +41,6 @@ github.com/leaanthony/synx v0.1.0 h1:R0lmg2w6VMb8XcotOwAe5DLyzwjLrskNkwU7LLWsyL8 github.com/leaanthony/synx v0.1.0/go.mod h1:Iz7eybeeG8bdq640iR+CwYb8p+9EOsgMWghkSRyZcqs= github.com/leaanthony/wincursor v0.1.0 h1:Dsyp68QcF5cCs65AMBmxoYNEm0n8K7mMchG6a8fYxf8= github.com/leaanthony/wincursor v0.1.0/go.mod h1:7TVwwrzSH/2Y9gLOGH+VhA+bZhoWXBRgbGNTMk+yimE= -github.com/masterminds/semver v1.4.2 h1:BgrAYDjlAebjtOwS7C/1QZoh5WgyXx4b59ydc+Ph8xI= -github.com/masterminds/semver v1.4.2/go.mod h1:s7KNT9fnd7edGzwwP7RBX4H0v/CYd5qdOLfkL1V75yg= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=