Skip to content

Commit

Permalink
Fixes add-tag target and CI publish workflow (#383)
Browse files Browse the repository at this point in the history
* add-tag did not tag the root module. This fixes the issue.
* publish workflow could possibly fail if build and cross-compile both
saves the binaries to the workspace concurently but publish only needs
the binary from the build step. So we are disabling persisting to
workspace from the cross-compile step.
  • Loading branch information
owais authored Jul 2, 2020
1 parent e4bfd4e commit 4f2808d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 0 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@ jobs:
- run:
name: Build collector for all archs
command: grep ^otelcontribcol-all-sys Makefile|fmt -w 1|tail -n +2|circleci tests split|xargs make
- persist_to_workspace:
root: ~/
paths: project/bin

unit-tests:
executor: golang
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ for-all:
add-tag:
@[ "${TAG}" ] || ( echo ">> env var TAG is not set"; exit 1 )
@echo "Adding tag ${TAG}"
@git tag -a ${TAG} -s -m "Version ${TAG}"
@set -e; for dir in $(ALL_MODULES); do \
(echo Adding tag "$${dir:2}/$${TAG}" && \
git tag -a "$${dir:2}/$${TAG}" -s -m "Version ${dir:2}/${TAG}" ); \
Expand Down

0 comments on commit 4f2808d

Please sign in to comment.