Skip to content

Commit f4539d1

Browse files
bdebylbdebyl
committed
dependabot-1 Removed unused bingo makefile target, newer go install in variables
1 parent 81ab7f1 commit f4539d1

File tree

3 files changed

+15
-127
lines changed

3 files changed

+15
-127
lines changed

‎.bingo/Variables.mk‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ GO ?= $(shell which go)
1616
# @echo "Running bingo"
1717
# @$(BINGO) <flags/args..>
1818
#
19-
BINGO := $(GOBIN)/bingo-v0.2.2
20-
$(BINGO): .bingo/bingo.mod
21-
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
22-
@echo "(re)installing $(GOBIN)/bingo-v0.2.2"
23-
@cd .bingo && $(GO) build -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.2.2 "github.com/bwplotka/bingo"
19+
#BINGO := $(GOBIN)/bingo-v0.2.2
20+
#$(BINGO): .bingo/bingo.mod
21+
# @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
22+
# @echo "(re)installing $(GOBIN)/bingo-v0.2.2"
23+
# @cd .bingo && $(GO) build -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.2.2 "github.com/bwplotka/bingo"
2424

25-
EMBEDMD := $(GOBIN)/embedmd-v1.0.0
26-
$(EMBEDMD): .bingo/embedmd.mod
25+
EMBEDMD := $(GOBIN)/embedmd
26+
$(EMBEDMD):
2727
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
2828
@echo "(re)installing $(GOBIN)/embedmd-v1.0.0"
29-
@cd .bingo && $(GO) build -modfile=embedmd.mod -o=$(GOBIN)/embedmd-v1.0.0 "github.com/campoy/embedmd"
29+
@ $(GO) install github.com/campoy/embedmd@v1.0.0
3030

31-
GOTEST := $(GOBIN)/gotest-v0.0.4
32-
$(GOTEST): .bingo/gotest.mod
31+
GOTEST := $(GOBIN)/gotest
32+
$(GOTEST):
3333
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
3434
@echo "(re)installing $(GOBIN)/gotest-v0.0.4"
35-
@cd .bingo && $(GO) build -modfile=gotest.mod -o=$(GOBIN)/gotest-v0.0.4 "github.com/rakyll/gotest"
35+
@ $(GO) install github.com/rakyll/gotest@v0.0.4
3636

37-
LICHE := $(GOBIN)/liche-v0.0.0-20200229003944-f57a5d1c5be4
38-
$(LICHE): .bingo/liche.mod
37+
LICHE := $(GOBIN)/liche
38+
$(LICHE):
3939
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
4040
@echo "(re)installing $(GOBIN)/liche-v0.0.0-20200229003944-f57a5d1c5be4"
41-
@cd .bingo && $(GO) build -modfile=liche.mod -o=$(GOBIN)/liche-v0.0.0-20200229003944-f57a5d1c5be4 "github.com/raviqqe/liche"
41+
@ $(GO) install github.com/raviqqe/liche@v0.0.0-20200229003944-f57a5d1c5be4
4242

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ all: drone-cache
4141
.PHONY: setup
4242
setup: ## Setups dev environment
4343
setup: vendor ; $(info $(M) running setup for development )
44-
$(Q) make $(GOTEST) $(EMBEDMD) $(LICHE) $(GOLANGCI_LINT) $(BINGO)
44+
$(Q) make $(GOTEST) $(EMBEDMD) $(LICHE) $(GOLANGCI_LINT)
4545

4646
drone-cache: ## Runs drone-cache target
4747
drone-cache: vendor main.go $(wildcard *.go) $(wildcard */*.go) ; $(info $(M) running drone-cache )

‎README.md‎

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -110,98 +110,6 @@ steps:
110110

111111
[embedmd]:# (tmp/help.txt)
112112
```txt
113-
NAME:
114-
Drone cache plugin - Drone cache plugin
115-
116-
USAGE:
117-
drone-cache [global options] command [command options] [arguments...]
118-
119-
VERSION:
120-
v1.2.2
121-
122-
COMMANDS:
123-
help, h Shows a list of commands or help for one command
124-
125-
GLOBAL OPTIONS:
126-
--log.level value log filtering level. ('error', 'warn', 'info', 'debug') (default: "info") [$PLUGIN_LOG_LEVEL, $LOG_LEVEL]
127-
--log.format value log format to use. ('logfmt', 'json') (default: "logfmt") [$PLUGIN_LOG_FORMAT, $LOG_FORMAT]
128-
--repo.fullname value repository full name [$DRONE_REPO]
129-
--repo.namespace value repository namespace [$DRONE_REPO_NAMESPACE]
130-
--repo.owner value repository owner (for Drone version < 1.0) [$DRONE_REPO_OWNER]
131-
--repo.name value repository name [$DRONE_REPO_NAME]
132-
--repo.link value repository link [$DRONE_REPO_LINK]
133-
--repo.avatar value repository avatar [$DRONE_REPO_AVATAR]
134-
--repo.branch value repository default branch [$DRONE_REPO_BRANCH]
135-
--repo.private repository is private (default: false) [$DRONE_REPO_PRIVATE]
136-
--repo.trusted repository is trusted (default: false) [$DRONE_REPO_TRUSTED]
137-
--remote.url value git remote url [$DRONE_REMOTE_URL]
138-
--commit.sha value git commit sha [$DRONE_COMMIT_SHA]
139-
--commit.ref value git commit ref (default: "refs/heads/master") [$DRONE_COMMIT_REF]
140-
--commit.branch value git commit branch (default: "master") [$DRONE_COMMIT_BRANCH]
141-
--commit.message value git commit message [$DRONE_COMMIT_MESSAGE]
142-
--commit.link value git commit link [$DRONE_COMMIT_LINK]
143-
--commit.author.name value git author name [$DRONE_COMMIT_AUTHOR]
144-
--commit.author.email value git author email [$DRONE_COMMIT_AUTHOR_EMAIL]
145-
--commit.author.avatar value git author avatar [$DRONE_COMMIT_AUTHOR_AVATAR]
146-
--build.event value build event (default: "push") [$DRONE_BUILD_EVENT]
147-
--build.number value build number (default: 0) [$DRONE_BUILD_NUMBER]
148-
--build.created value build created (default: 0) [$DRONE_BUILD_CREATED]
149-
--build.started value build started (default: 0) [$DRONE_BUILD_STARTED]
150-
--build.finished value build finished (default: 0) [$DRONE_BUILD_FINISHED]
151-
--build.status value build status (default: "success") [$DRONE_BUILD_STATUS]
152-
--build.link value build link [$DRONE_BUILD_LINK]
153-
--build.deploy value build deployment target [$DRONE_DEPLOY_TO]
154-
--yaml.verified build yaml is verified (default: false) [$DRONE_YAML_VERIFIED]
155-
--yaml.signed build yaml is signed (default: false) [$DRONE_YAML_SIGNED]
156-
--prev.build.number value previous build number (default: 0) [$DRONE_PREV_BUILD_NUMBER]
157-
--prev.build.status value previous build status [$DRONE_PREV_BUILD_STATUS]
158-
--prev.commit.sha value previous build sha [$DRONE_PREV_COMMIT_SHA]
159-
--backend value cache backend to use in plugin (s3, filesystem, sftp, azure, gcs) (default: "s3") [$PLUGIN_BACKEND]
160-
--mount value cache directories, an array of folders to cache [$PLUGIN_MOUNT]
161-
--rebuild rebuild the cache directories (default: false) [$PLUGIN_REBUILD]
162-
--restore restore the cache directories (default: false) [$PLUGIN_RESTORE]
163-
--cache-key value cache key to use for the cache directories [$PLUGIN_CACHE_KEY]
164-
--remote-root value remote root directory to contain all the cache files created (default repo.name) [$PLUGIN_REMOTE_ROOT]
165-
--local-root value local root directory to base given mount paths (default pwd [present working directory]) [$PLUGIN_LOCAL_ROOT]
166-
--override override even if cache key already exists in backend (default: true) [$PLUGIN_OVERRIDE]
167-
--archive-format value archive format to use to store the cache directories (tar, gzip, zstd) (default: "tar") [$PLUGIN_ARCHIVE_FORMAT]
168-
--compression-level value compression level to use for gzip/zstd compression when archive-format specified as gzip/zstd
169-
(check https://godoc.org/compress/flate#pkg-constants for available options for gzip
170-
and https://pkg.go.dev/github.com/klauspost/compress/zstd#EncoderLevelFromZstd for zstd) (default: -1) [$PLUGIN_COMPRESSION_LEVEL]
171-
--skip-symlinks skip symbolic links in archive (default: false) [$PLUGIN_SKIP_SYMLINKS, $SKIP_SYMLINKS]
172-
--debug debug (default: false) [$PLUGIN_DEBUG, $DEBUG]
173-
--backend.operation-timeout value timeout value to use for each storage operations (default: 3m0s) [$PLUGIN_BACKEND_OPERATION_TIMEOUT, $BACKEND_OPERATION_TIMEOUT]
174-
--endpoint value endpoint for the s3/cloud storage connection [$PLUGIN_ENDPOINT, $S3_ENDPOINT, $GCS_ENDPOINT]
175-
--bucket value AWS bucket name [$PLUGIN_BUCKET, $S3_BUCKET, $GCS_BUCKET]
176-
--filesystem.cache-root value local filesystem root directory for the filesystem cache (default: "/tmp/cache") [$PLUGIN_FILESYSTEM_CACHE_ROOT, $FILESYSTEM_CACHE_ROOT]
177-
--access-key value AWS access key [$PLUGIN_ACCESS_KEY, $AWS_ACCESS_KEY_ID, $CACHE_AWS_ACCESS_KEY_ID]
178-
--secret-key value AWS secret key [$PLUGIN_SECRET_KEY, $AWS_SECRET_ACCESS_KEY, $CACHE_AWS_SECRET_ACCESS_KEY]
179-
--region value AWS bucket region. (us-east-1, eu-west-1, ...) [$PLUGIN_REGION, $S3_REGION]
180-
--path-style AWS path style to use for bucket paths. (true for minio, false for aws) (default: false) [$PLUGIN_PATH_STYLE, $AWS_PLUGIN_PATH_STYLE]
181-
--acl value upload files with acl (private, public-read, ...) (default: "private") [$PLUGIN_ACL, $AWS_ACL]
182-
--encryption value server-side encryption algorithm, defaults to none. (AES256, aws:kms) [$PLUGIN_ENCRYPTION, $AWS_ENCRYPTION]
183-
--s3-bucket-public value Set to use anonymous credentials with public S3 bucket [$PLUGIN_S3_BUCKET_PUBLIC, $S3_BUCKET_PUBLIC]
184-
--sts-endpoint value Custom STS endpoint for IAM role assumption [$PLUGIN_STS_ENDPOINT, $AWS_STS_ENDPOINT]
185-
--role-arn value AWS IAM role ARN to assume [$PLUGIN_ASSUME_ROLE_ARN, $AWS_ASSUME_ROLE_ARN]
186-
--gcs.api-key value Google service account API key [$PLUGIN_API_KEY, $GCP_API_KEY]
187-
--gcs.json-key value Google service account JSON key [$PLUGIN_JSON_KEY, $GCS_CACHE_JSON_KEY]
188-
--gcs.acl value upload files with acl (private, public-read, ...) (default: "private") [$PLUGIN_GCS_ACL, $GCS_ACL]
189-
--gcs.encryption-key value server-side encryption key, must be a 32-byte AES-256 key, defaults to none
190-
(See https://cloud.google.com/storage/docs/encryption for details.) [$PLUGIN_GCS_ENCRYPTION_KEY, $GCS_ENCRYPTION_KEY]
191-
--azure.account-name value Azure Blob Storage Account Name [$PLUGIN_ACCOUNT_NAME, $AZURE_ACCOUNT_NAME]
192-
--azure.account-key value Azure Blob Storage Account Key [$PLUGIN_ACCOUNT_KEY, $AZURE_ACCOUNT_KEY]
193-
--azure.blob-container-name value Azure Blob Storage container name [$PLUGIN_CONTAINER, $AZURE_CONTAINER_NAME]
194-
--azure.blob-storage-url value Azure Blob Storage URL (default: "blob.core.windows.net") [$AZURE_BLOB_STORAGE_URL]
195-
--azure.blob-max-retry-requets value Azure Blob Storage Max Retry Requests (default: 4) [$AZURE_BLOB_MAX_RETRY_REQUESTS]
196-
--sftp.cache-root value sftp root directory [$SFTP_CACHE_ROOT]
197-
--sftp.username value sftp username [$PLUGIN_USERNAME, $SFTP_USERNAME]
198-
--sftp.password value sftp password [$PLUGIN_PASSWORD, $SFTP_PASSWORD]
199-
--sftp.public-key-file value sftp public key file path [$PLUGIN_PUBLIC_KEY_FILE, $SFTP_PUBLIC_KEY_FILE]
200-
--sftp.auth-method value sftp auth method, defaults to none. (PASSWORD, PUBLIC_KEY_FILE) [$SFTP_AUTH_METHOD]
201-
--sftp.host value sftp host [$SFTP_HOST]
202-
--sftp.port value sftp port [$SFTP_PORT]
203-
--help, -h show help (default: false)
204-
--version, -v print the version (default: false)
205113
```
206114

207115
### Using Docker (with Environment variables)
@@ -225,26 +133,6 @@ $ docker run --rm \
225133

226134
[embedmd]:# (tmp/make_help.txt)
227135
```txt
228-
Usage:
229-
make <target>
230-
231-
Targets:
232-
setup Setups dev environment
233-
drone-cache Runs drone-cache target
234-
clean Cleans build resourcess
235-
docs Generates docs
236-
generate Generate documentation, website and yaml files,
237-
vendor Updates vendored copy of dependencies
238-
compress Creates compressed binary
239-
container Builds drone-cache docker image with latest tag
240-
container-push Pushes latest $(CONTAINER_REPO) image to repository
241-
test Runs tests
242-
test-integration Runs integration tests
243-
test-unit Runs unit tests
244-
lint Runs golangci-lint analysis
245-
fix Runs golangci-lint fix
246-
format Runs gofmt
247-
help Shows this help message
248136
```
249137

250138
## Releases

0 commit comments

Comments
 (0)