Skip to content

Commit

Permalink
wrong branch name (#1014)
Browse files Browse the repository at this point in the history
* wrong branch name

* vegeta download
  • Loading branch information
6l20 authored May 20, 2022
1 parent 934658d commit 29dc660
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ workflows:
docker-password: ${CLOUDSMITH_PASS_RW}
filters:
branches:
only: maintenancev21.12
only: main
tags:
only: /^v.*/
- build-docker-arm-image: # Push Develop arm image
Expand All @@ -479,7 +479,7 @@ workflows:
docker-password: ${CLOUDSMITH_PASS_RW}
filters:
branches:
only: maintenancev21.12
only: main
tags:
only: /^v.*/
- deploy:
Expand All @@ -493,7 +493,7 @@ workflows:
- push-orchestrate-dev-image
filters:
branches:
only: maintenancev21.12
only: main
- deploy:
name: deploy-staging
context:
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ DEPS_KAFKA = zookeeper kafka
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
OPEN = xdg-open
VEGETA_BIN_URL = https://github.com/tsenart/vegeta/releases/download/v12.8.4/vegeta_12.8.4_darwin_amd64.tar.gz
VEGETA_BIN_URL = https://github.com/tsenart/vegeta/releases/download/v12.8.4/vegeta_12.8.4_linux_amd64.tar.gz
endif
ifeq ($(UNAME_S),Darwin)
OPEN = open
VEGETA_BIN_URL = https://github.com/tsenart/vegeta/releases/download/v12.8.4/vegeta_12.8.4_linux_amd64.tar.gz
VEGETA_BIN_URL = https://github.com/tsenart/vegeta/releases/download/v12.8.4/vegeta_12.8.4_darwin_amd64.tar.gz
endif

ifneq (,$(wildcard ./.env))
Expand Down Expand Up @@ -119,9 +119,9 @@ lint-tools: ## Install linting tools
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.27.0

get-vegeta:
@curl -sSfL $(VEGETA_BIN_URL) -o vegeta.tar.gz
@tar -xvf vegeta.tar.gz vegeta
@chmod +x vegeta
@curl -sSfL $(VEGETA_BIN_URL) -o /tmp/vegeta.tar.gz
@tar -xvf /tmp/vegeta.tar.gz -C ${GOBIN} vegeta
@chmod +x ${GOBIN}/vegeta

tools: lint-tools get-vegeta## Install test tools
go install github.com/golang/mock/[email protected]
Expand Down

0 comments on commit 29dc660

Please sign in to comment.