Skip to content

Commit

Permalink
Merge pull request #355 from aegershman/gomod-conversion
Browse files Browse the repository at this point in the history
Move to using go modules
  • Loading branch information
redhatrises authored Aug 27, 2020
2 parents 51541f2 + a00b406 commit 70bb337
Show file tree
Hide file tree
Showing 542 changed files with 87,567 additions and 74,823 deletions.
216 changes: 0 additions & 216 deletions Gopkg.lock

This file was deleted.

34 changes: 0 additions & 34 deletions Gopkg.toml

This file was deleted.

46 changes: 23 additions & 23 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
---
version: 1.0.{build}

branches:
only:
- master
- master
clone_folder: c:\gopath\src\github.com\opencontrol\compliance-masonry

environment:
GOPATH: c:\gopath
GO111MODULE: on

install:
- choco install sed
- cmd: >-
echo %GOPATH%
- choco install sed
- cmd: >-
echo %GOPATH%
go version
go version
go env
go env
go get github.com/Masterminds/glide
set PATH=%PATH%;%GOPATH%\bin
set PATH=%PATH%;%GOPATH%\bin
- ps: >-
$env:GITVERSION = git describe --abbrev=0 --tags
- ps: >-
$env:GITVERSION = git describe --abbrev=0 --tags
$env:VERSION = $env:GITVERSION -replace 'v', ''
$env:VERSION = $env:GITVERSION -replace 'v', ''
$env:SHORTCOMMIT = git rev-parse --short HEAD
$env:SHORTCOMMIT = git rev-parse --short HEAD
$env:BUILD_INFO = date -u +"%Y-%m-%dT%T%z"
$env:BUILD_INFO = date -u +"%Y-%m-%dT%T%z"
build_script:
- cmd: go build -ldflags="-s -w -X github.com/opencontrol/compliance-masonry/version.Version=%VERSION% -X github.com/opencontrol/compliance-masonry/version.Commit=%SHORTCOMMIT% -X github.com/opencontrol/compliance-masonry/version.Date=%BUILD_INFO%" cmd/compliance-masonry/compliance-masonry.go
- cmd: go build -mod=vendor -ldflags="-s -w -X github.com/opencontrol/compliance-masonry/version.Version=%VERSION% -X github.com/opencontrol/compliance-masonry/version.Commit=%SHORTCOMMIT% -X github.com/opencontrol/compliance-masonry/version.Date=%BUILD_INFO%" cmd/compliance-masonry/compliance-masonry.go

- cmd: go build -ldflags="-s -w -X github.com/opencontrol/compliance-masonry/version.Version=%VERSION% -X github.com/opencontrol/compliance-masonry/version.Commit=%SHORTCOMMIT% -X github.com/opencontrol/compliance-masonry/version.Date=%BUILD_INFO%" cmd/masonry/masonry.go
- cmd: go build -mod=vendor -ldflags="-s -w -X github.com/opencontrol/compliance-masonry/version.Version=%VERSION% -X github.com/opencontrol/compliance-masonry/version.Commit=%SHORTCOMMIT% -X github.com/opencontrol/compliance-masonry/version.Date=%BUILD_INFO%" cmd/masonry/masonry.go

- cmd: copy build\msi\*.* %cd%
- cmd: >-
sed.exe -i "s/BUILD_TAG_VERSION/%VERSION%/g" compliance-masonry.wxs
- cmd: copy build\msi\*.* %cd%
- cmd: >-
sed.exe -i "s/BUILD_TAG_VERSION/%VERSION%/g" compliance-masonry.wxs
"%WIX%\bin\candle.exe" compliance-masonry.wxs
"%WIX%\bin\candle.exe" compliance-masonry.wxs
"%WIX%\bin\light.exe" compliance-masonry.wixobj -ext WixUIExtension -out compliance-masonry-%VERSION%.msi
"%WIX%\bin\light.exe" compliance-masonry.wixobj -ext WixUIExtension -out compliance-masonry-%VERSION%.msi
artifacts:
- path: compliance-masonry-%VERSION%.msi
- path: compliance-masonry-%VERSION%.msi

test_script:
- cmd: FOR /F %%A IN ('glide novendor') DO go test -v %%A || exit /b 1
- cmd: go test -mod=vendor ./... || exit /b 1

deploy:
provider: GitHub
Expand Down
23 changes: 23 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
module github.com/opencontrol/compliance-masonry

go 1.15

require (
github.com/Masterminds/vcs v1.13.1
github.com/blang/semver v1.1.1-0.20200524153540-4487282d7812
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/set v0.2.1
github.com/onsi/ginkgo v1.14.1-0.20200812193004-f49cf5da3a2f
github.com/onsi/gomega v1.10.2-0.20200811195334-990941a380b2
github.com/spf13/cobra v1.0.1-0.20200823174541-9ed1d713d619
github.com/spf13/pflag v1.0.6-0.20200504143853-81378bbcd8a1 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709
github.com/tg/gosortmap v0.0.0-20190425101757-4b9ddc7c3a61
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 // indirect
golang.org/x/text v0.3.4-0.20200821135104-79eda68eebff // indirect
gopkg.in/yaml.v2 v2.3.1-0.20200602174213-b893565b90ca
vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787
)
Loading

0 comments on commit 70bb337

Please sign in to comment.