Skip to content

Commit 4f2808d

Browse files
authored
Fixes add-tag target and CI publish workflow (#383)
* 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.
1 parent e4bfd4e commit 4f2808d

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

.circleci/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,6 @@ jobs:
234234
- run:
235235
name: Build collector for all archs
236236
command: grep ^otelcontribcol-all-sys Makefile|fmt -w 1|tail -n +2|circleci tests split|xargs make
237-
- persist_to_workspace:
238-
root: ~/
239-
paths: project/bin
240237

241238
unit-tests:
242239
executor: golang

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ for-all:
6666
add-tag:
6767
@[ "${TAG}" ] || ( echo ">> env var TAG is not set"; exit 1 )
6868
@echo "Adding tag ${TAG}"
69+
@git tag -a ${TAG} -s -m "Version ${TAG}"
6970
@set -e; for dir in $(ALL_MODULES); do \
7071
(echo Adding tag "$${dir:2}/$${TAG}" && \
7172
git tag -a "$${dir:2}/$${TAG}" -s -m "Version ${dir:2}/${TAG}" ); \

0 commit comments

Comments
 (0)