Skip to content

Commit 8e0ba25

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collector-releases into release-ebpf-profiler-distro
2 parents c9466ba + 6c2de56 commit 8e0ba25

File tree

18 files changed

+417
-599
lines changed

18 files changed

+417
-599
lines changed

.chloggen/add_skywalkingencodingextension_in_otel_col_contrib.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.chloggen/mowies-fix-checksums.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.chloggen/mowies-nightly-releases.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.chloggen/prometheus-exporter.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.chloggen/remove_opencensus.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.chloggen/remove_opencensus_contrib.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.chloggen/remove_opencensus_k8s.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.chloggen/rv64.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/base-release.yaml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,24 @@ env:
2626
GORELEASER_PRO_VERSION: v2.11.2
2727

2828
jobs:
29-
prepare:
29+
prev-tag:
3030
outputs:
3131
PREVIOUS_RELEASE_TAG: ${{ steps.prev-tag.outputs.PREVIOUS_RELEASE_TAG }}
32+
runs-on: ubuntu-latest
33+
steps:
34+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
35+
with:
36+
fetch-depth: 0
37+
- name: Set goreleaser last tag reference in case of non-nightly release
38+
id: prev-tag
39+
if: inputs.nightly != 'true'
40+
# find previous tag by filtering out nightly tags and binary release (OCB, OpAMP) tags and then choosing the
41+
# second to last tag (last one is the current release)
42+
run: |
43+
prev_tag=$(git tag | grep -v "cmd" | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1)
44+
echo "PREVIOUS_RELEASE_TAG=$prev_tag" >> "$GITHUB_OUTPUT"
45+
46+
prepare:
3247
strategy:
3348
matrix:
3449
GOOS: ${{ fromJSON(inputs.goos) }}
@@ -80,15 +95,6 @@ jobs:
8095
go-version: "~1.24"
8196
check-latest: true
8297

83-
- name: Set goreleaser last tag reference in case of non-nightly release
84-
id: prev-tag
85-
if: inputs.nightly != 'true'
86-
# find previous tag by filtering out nightly tags and binary release (OCB, OpAMP) tags and then choosing the
87-
# second to last tag (last one is the current release)
88-
run: |
89-
prev_tag=$(git tag | grep -v "cmd" | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1)
90-
echo "PREVIOUS_RELEASE_TAG=$prev_tag" >> "$GITHUB_OUTPUT"
91-
9298
- name: Set nightly enabled
9399
id: nightly-check
94100
if: inputs.nightly == 'true'
@@ -258,7 +264,7 @@ jobs:
258264
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
259265
COSIGN_YES: true
260266
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
261-
GORELEASER_PREVIOUS_TAG: ${{ needs.prepare.outputs.PREVIOUS_RELEASE_TAG }}
267+
GORELEASER_PREVIOUS_TAG: ${{ needs.prev-tag.outputs.PREVIOUS_RELEASE_TAG }}
262268
GORELEASER_CURRENT_TAG: ${{ github.ref_name }}
263269

264270
create-issue:

.github/workflows/update-version.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ jobs:
4444
run: |
4545
echo "name=${{ steps.otelbot-token.outputs.app-slug }}[bot]" >> "$GITHUB_OUTPUT"
4646
echo "email=${{ steps.get-user-id.outputs.user-id }}+${{ steps.otelbot-token.outputs.app-slug }}[bot]@users.noreply.github.com>" >> "$GITHUB_OUTPUT"
47-
git config --global user.name "$name"
48-
git config --global user.email "$email"
47+
git config --global user.name "${{ steps.otelbot-token.outputs.app-slug }}[bot]"
48+
git config --global user.email "${{ steps.get-user-id.outputs.user-id }}+${{ steps.otelbot-token.outputs.app-slug }}[bot]@users.noreply.github.com>"
4949
5050
- name: Checkout repository
5151
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

0 commit comments

Comments
 (0)