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.

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

🎉 v10 🎉 #2966

Merged
merged 11 commits into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ builds:
- -tags="production netgo"
ldflags:
- "-extldflags=-static"
- -s -w -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}}
- -s -w -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}}
- id: macos
main: ./apps/cnquery/cnquery.go
binary: cnquery
Expand All @@ -41,7 +41,7 @@ builds:
flags: -tags production
ldflags:
# clang + macos does not support static: - -extldflags "-static"
- -s -w -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}}
- -s -w -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}}
hooks:
post:
- cmd: /tmp/quill sign-and-notarize "{{ .Path }}" -vv || true
Expand All @@ -59,7 +59,7 @@ builds:
flags: -tags production -buildmode exe
ldflags:
- "-extldflags -static"
- -s -w -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}}
- -s -w -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}}
hooks:
post:
- cmd: jsign --storetype DIGICERTONE --alias "{{ .Env.SM_CERT_ALIAS }}" --storepass "{{ .Env.SM_API_KEY }}|{{ .Env.SM_CLIENT_CERT_FILE}}|{{ .Env.SM_CLIENT_CERT_PASSWORD }}" --tsaurl "http://timestamp.digicert.com" '{{ .Path }}'
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ ifeq ($(TARGETOS),windows)
BIN_SUFFIX=".exe"
endif

LDFLAGS=-ldflags "-s -w -X go.mondoo.com/cnquery/v9.Version=${VERSION} -X go.mondoo.com/cnquery/v9.Build=${TAG}" # -linkmode external -extldflags=-static
LDFLAGSDIST=-tags production -ldflags "-s -w -X go.mondoo.com/cnquery/v9.Version=${LATEST_VERSION_TAG} -X go.mondoo.com/cnquery/v9.Build=${TAG} -s -w"
LDFLAGS=-ldflags "-s -w -X go.mondoo.com/cnquery/v10.Version=${VERSION} -X go.mondoo.com/cnquery/v10.Build=${TAG}" # -linkmode external -extldflags=-static
LDFLAGSDIST=-tags production -ldflags "-s -w -X go.mondoo.com/cnquery/v10.Version=${LATEST_VERSION_TAG} -X go.mondoo.com/cnquery/v10.Build=${TAG} -s -w"

.PHONY: info/ldflags
info/ldflags:
Expand All @@ -56,7 +56,7 @@ prep/tools/windows:


prep/tools/protolint:
# protobuf lintingng
# protobuf linting
go install github.com/yoheimuta/protolint/cmd/protolint@latest

prep/tools: prep/tools/protolint
Expand Down
10 changes: 0 additions & 10 deletions _motor/discovery/common/context.go

This file was deleted.

31 changes: 0 additions & 31 deletions _motor/discovery/common/credentials.go

This file was deleted.

11 changes: 0 additions & 11 deletions _motor/discovery/common/labels.go

This file was deleted.

43 changes: 0 additions & 43 deletions _motor/discovery/common/projectname.go

This file was deleted.

24 changes: 0 additions & 24 deletions _motor/discovery/common/projectname_test.go

This file was deleted.

76 changes: 0 additions & 76 deletions _motor/discovery/gcp/instancesnapshot/resolver.go

This file was deleted.

117 changes: 0 additions & 117 deletions _motor/discovery/gcp/resolver_folder.go

This file was deleted.

Loading