Skip to content

Commit 7c29cda

Browse files
authored
switch main tagging scheme (#96)
1 parent 15ea9df commit 7c29cda

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

.github/workflows/tag_linux.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ name: Release linux profiler
33
on:
44
push:
55
tags:
6-
- v*-pyroscope
7-
6+
- 'v*'
7+
- '!v*opentelemetry'
8+
- '!v*opentracing'
89
jobs:
910
release-linux-profiler-x86_64:
1011
runs-on: ubuntu-latest
@@ -26,6 +27,7 @@ jobs:
2627
with:
2728
username: ${{ secrets.DOCKERHUB_USERNAME }}
2829
password: ${{ secrets.DOCKERHUB_PASSWORD }}
30+
- run: make bump_version && git diff --exit-code
2931
- run: make docker/build
3032
- run: make docker/push
3133
- run: make docker/archive
@@ -53,6 +55,7 @@ jobs:
5355
with:
5456
username: ${{ secrets.DOCKERHUB_USERNAME }}
5557
password: ${{ secrets.DOCKERHUB_PASSWORD }}
58+
- run: make bump_version && git diff --exit-code
5659
- run: make docker/build
5760
- run: make docker/push
5861
- run: make docker/archive

.github/workflows/tag_managed_helper.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,24 @@ name: Release managed helper
33
on:
44
push:
55
tags:
6-
- v*-pyroscope
6+
- 'v*'
7+
- '!v*opentelemetry'
8+
- '!v*opentracing'
79

810
jobs:
911
release-managed-helper:
1012
runs-on: ubuntu-latest
13+
env:
14+
RELEASE_VERSION: ${{ github.ref_name }}
1115
steps:
12-
-
13-
name: Checkout
16+
- name: Checkout
1417
uses: actions/checkout@v4
1518
with:
1619
submodules: 'true'
1720
- uses: actions/setup-dotnet@v3
1821
with:
1922
dotnet-version: '6.0'
23+
- run: make bump_version && git diff --exit-code
2024
- run: dotnet build -c Release
2125
working-directory: Pyroscope
2226
- name: Publish the package to nuget.org

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ DOCKER_IMAGE ?= pyroscope/pyroscope-dotnet
66
ifeq ($(RELEASE_VERSION),)
77
$(error "no release version specified")
88
endif
9-
RELEASE_VERSION_TMP := $(shell echo $(RELEASE_VERSION) | sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+)-pyroscope$$/\1/')
9+
RELEASE_VERSION_TMP := $(shell echo $(RELEASE_VERSION) | sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+)(-pyroscope)?$$/\1/')
1010
#$(error "debug $(RELEASE_VERSION_TMP)")
1111
RELEASE_VERSION := $(RELEASE_VERSION_TMP)
1212

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "6.0.0",
44
"rollForward": "minor"
55
}
66
}

0 commit comments

Comments
 (0)