Skip to content

Commit 099c3db

Browse files
authored
chore: fix GHA release (#51)
1 parent 74985cf commit 099c3db

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

.github/workflows/release.yaml

+14-5
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ jobs:
4141
run: |
4242
echo "LAST_TAG=`git tag --sort=committerdate | tail -1`" >> $GITHUB_ENV
4343
ARTIFACT_VERSION=${RELEASE:1}
44-
echo "ARTIFACT_VERSION=ARTIFACT_VERSION" >> $GITHUB_ENV
44+
echo "ARTIFACT_VERSION=$ARTIFACT_VERSION" >> $GITHUB_ENV
4545
46-
ARTIFACT="otelcol-contrib_${{ env.ARTIFACT_VERSION }}_linux_amd64.tar.gz"
46+
ARTIFACT="otelcol-contrib_${ARTIFACT_VERSION}_linux_amd64.tar.gz"
4747
ARTIFACT_URL="https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/$RELEASE/$ARTIFACT"
4848
4949
mkdir .temp/
@@ -69,8 +69,11 @@ jobs:
6969
zip -j otelcol-contrib-amd64.zip runner/otelcol-contrib
7070
7171
- name: Download and zip arm64
72+
env:
73+
RELEASE: ${{needs.check.outputs.release}}
74+
ARTIFACT_VERSION: ${{ env.ARTIFACT_VERSION }}
7275
run: |
73-
ARTIFACT="otelcol-contrib_${{ env.ARTIFACT_VERSION }}_linux_arm64.tar.gz"
76+
ARTIFACT="otelcol-contrib_${ARTIFACT_VERSION}_linux_arm64.tar.gz"
7477
ARTIFACT_URL="https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/$RELEASE/$ARTIFACT"
7578
mkdir .temp/
7679
wget -O .temp/otelcol-contrib.tar.gz $ARTIFACT_URL
@@ -80,15 +83,19 @@ jobs:
8083
rm -rf .temp/
8184
8285
- name: Generate release changelog
86+
env:
87+
LAST_TAG: ${{ env.LAST_TAG }}
8388
run: |
8489
echo "# What's new" > changelog.md
8590
git log ${{ env.LAST_TAG }}..HEAD --pretty=format:"$ad- %s [%an]" >> changelog.md
8691
sed -i -e "s/- /• /g" changelog.md
8792
8893
- name: Release
8994
uses: softprops/action-gh-release@v1
95+
env:
96+
TAG: ${{needs.check.outputs.release}}
9097
with:
91-
tag_name: ${{ env.RELEASE }}
98+
tag_name: ${{ env.TAG }}
9299
body_path: ./changelog.md
93100
files: |
94101
otlpinf-amd64.zip
@@ -109,6 +116,8 @@ jobs:
109116

110117
- name: Build image and push
111118
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 #v6.10.0
119+
env:
120+
TAG: ${{needs.check.outputs.release}}
112121
with:
113122
context: .
114123
file: docker/Dockerfile
@@ -118,4 +127,4 @@ jobs:
118127
cache-to: type=gha,mode=max
119128
tags: |
120129
netboxlabs/opentelemetry-infinity:latest
121-
netboxlabs/opentelemetry-infinity:${{ env.RELEASE }}
130+
netboxlabs/opentelemetry-infinity:${{ env.TAG }}

0 commit comments

Comments
 (0)