Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Single module repo #304

Merged
merged 3 commits into from
May 24, 2021
Merged

Single module repo #304

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0eef65e
remove sub modules, convert to single module repo
jsirianni May 18, 2021
f947e6c
Replace version system by checking for GIT_TAG during the build inste…
jsirianni May 18, 2021
2a0910e
rebase
jsirianni May 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
name: Build
command: |
export VERSION="$CIRCLE_TAG"
export GIT_TAG="$CIRCLE_TAG"
make install-tools
make build-all
sed "s|/releases/latest/download|/releases/download/$VERSION|g" < ./scripts/unix-install.sh > ./artifacts/unix-install.sh
Expand Down
7 changes: 6 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ GOARCH=$(shell go env GOARCH)
GOFLAGS=-mod=mod

GIT_SHA=$(shell git rev-parse --short HEAD)
GIT_COMMIT=$(shell git rev-parse HEAD)

PROJECT_ROOT = $(shell pwd)
ARTIFACTS = ${PROJECT_ROOT}/artifacts
Expand Down Expand Up @@ -67,7 +68,11 @@ generate:

.PHONY: build
build:
(cd ./cmd/stanza && CGO_ENABLED=0 go build -o ../../artifacts/stanza_$(GOOS)_$(GOARCH) .)
(cd ./cmd/stanza && \
CGO_ENABLED=0 \
go build \
-ldflags "-X github.com/observiq/stanza/version.GitTag=${GIT_TAG} -X github.com/observiq/stanza/version.GitCommit=${GIT_COMMIT}" \
-o ../../artifacts/stanza_$(GOOS)_$(GOARCH) .)

.PHONY: install
install:
Expand Down
38 changes: 0 additions & 38 deletions cmd/stanza/go.mod
View file
Open in desktop

This file was deleted.

1,667 changes: 0 additions & 1,667 deletions cmd/stanza/go.sum
View file
Open in desktop

This file was deleted.

35 changes: 21 additions & 14 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,38 @@ module github.com/observiq/stanza
go 1.14

require (
cloud.google.com/go/logging v1.4.1
github.com/Azure/azure-event-hubs-go/v3 v3.3.7
github.com/antonmedv/expr v1.8.2
github.com/aws/aws-sdk-go v1.38.31
github.com/bmatcuk/doublestar/v2 v2.0.4
github.com/cenkalti/backoff/v4 v4.0.2
github.com/elastic/go-elasticsearch/v7 v7.12.0
github.com/golang/protobuf v1.5.2
github.com/hashicorp/go-uuid v1.0.2
github.com/jpillora/backoff v1.0.0
github.com/json-iterator/go v1.1.10
github.com/kr/text v0.2.0 // indirect
github.com/kardianos/service v1.2.0
github.com/mitchellh/mapstructure v1.4.1
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/observiq/ctimefmt v1.0.0
github.com/observiq/go-syslog/v3 v3.0.2
github.com/observiq/nanojack v0.0.0-20201106172433-343928847ebc
github.com/spf13/cobra v1.1.3
github.com/stretchr/testify v1.6.1
go.etcd.io/bbolt v1.3.4
go.uber.org/zap v1.15.0
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 // indirect
golang.org/x/text v0.3.3
golang.org/x/tools v0.0.0-20200904185747-39188db58858 // indirect
go.opentelemetry.io/collector v0.13.0
go.uber.org/multierr v1.5.0
go.uber.org/zap v1.16.0
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324
golang.org/x/text v0.3.6
gonum.org/v1/gonum v0.6.2
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/yaml.v2 v2.3.0
honnef.co/go/tools v0.0.1-2020.1.5 // indirect
google.golang.org/api v0.46.0
google.golang.org/genproto v0.0.0-20210518161634-ec7691c0a37d
google.golang.org/grpc v1.37.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.1
k8s.io/apimachinery v0.21.1
k8s.io/client-go v0.21.1
)
Loading