Skip to content

Commit aac78a7

Browse files
authored
fix(ci): Avoid release artifact collision (#915)
## 📝 Summary Separate jobs/steps are writing the same rbuilder artifact. Previously the end result was a linux binary. And lately, it is a macOS binary. This PR separates artifact writes by OS and arch, in `*.tar.gz` format.
1 parent 99b86f0 commit aac78a7

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

.github/workflows/release.yaml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,47 +165,59 @@ jobs:
165165
--bin bid-scraper \
166166
--bin rbuilder-rebalancer
167167
168+
- name: Rename binaries
169+
if: steps.platform-check.outputs.skip != 'true'
170+
env:
171+
VERSION: ${{ needs.extract-version.outputs.VERSION }}
172+
TARGET: ${{ matrix.target }}
173+
FEATURES_SUFFIX: ${{ matrix.features && format('-{0}', matrix.features) || '' }}
174+
run: |
175+
cd target/${{ matrix.profile }}
176+
for bin in rbuilder rbuilder-operator tbv-bidding-service reth-rbuilder bid-scraper rbuilder-rebalancer; do
177+
[ -f "$bin" ] && mv "$bin" "${bin}-${VERSION}-${TARGET}${FEATURES_SUFFIX}"
178+
done
179+
168180
- name: Upload rbuilder artifact
169181
if: steps.platform-check.outputs.skip != 'true'
170182
uses: actions/upload-artifact@v4
171183
with:
172184
name: rbuilder-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && '-' }}${{ matrix.features }}
173-
path: target/${{ matrix.profile }}/rbuilder
185+
path: target/${{ matrix.profile }}/rbuilder-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && format('-{0}', matrix.features) || '' }}
174186

175187
- name: Upload rbuilder-operator artifact
176188
if: steps.platform-check.outputs.skip != 'true'
177189
uses: actions/upload-artifact@v4
178190
with:
179191
name: rbuilder-operator-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && '-' }}${{ matrix.features }}
180-
path: target/${{ matrix.profile }}/rbuilder-operator
192+
path: target/${{ matrix.profile }}/rbuilder-operator-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && format('-{0}', matrix.features) || '' }}
181193

182194
- name: Upload tbv-bidding-service artifact
183195
if: steps.platform-check.outputs.skip != 'true'
184196
uses: actions/upload-artifact@v4
185197
with:
186198
name: tbv-bidding-service-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && '-' }}${{ matrix.features }}
187-
path: target/${{ matrix.profile }}/tbv-bidding-service
199+
path: target/${{ matrix.profile }}/tbv-bidding-service-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && format('-{0}', matrix.features) || '' }}
188200

189201
- name: Upload reth-rbuilder artifact
190202
if: steps.platform-check.outputs.skip != 'true'
191203
uses: actions/upload-artifact@v4
192204
with:
193205
name: reth-rbuilder-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && '-' }}${{ matrix.features }}
194-
path: target/${{ matrix.profile }}/reth-rbuilder
206+
path: target/${{ matrix.profile }}/reth-rbuilder-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && format('-{0}', matrix.features) || '' }}
195207

196208
- name: Upload bid-scraper artifact
197209
if: steps.platform-check.outputs.skip != 'true'
198210
uses: actions/upload-artifact@v4
199211
with:
200212
name: bid-scraper-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && '-' }}${{ matrix.features }}
201-
path: target/${{ matrix.profile }}/bid-scraper
213+
path: target/${{ matrix.profile }}/bid-scraper-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && format('-{0}', matrix.features) || '' }}
202214

203215
- name: Upload rbuilder-rebalancer artifact
204216
if: steps.platform-check.outputs.skip != 'true'
205217
uses: actions/upload-artifact@v4
206218
with:
207219
name: rbuilder-rebalancer-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && '-' }}${{ matrix.features }}
208-
path: target/${{ matrix.profile }}/rbuilder-rebalancer
220+
path: target/${{ matrix.profile }}/rbuilder-rebalancer-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.features && format('-{0}', matrix.features) || '' }}
209221

210222
- name: Upload *.deb packages
211223
if: steps.platform-check.outputs.skip != 'true' && matrix.platform == 'linux'
@@ -290,12 +302,14 @@ jobs:
290302
- name: Verify binary exists
291303
if: steps.download-binary.outcome == 'success'
292304
run: |
293-
if [ -f "./rbuilder" ]; then
305+
BIN="rbuilder-${{ env.VERSION }}-x86_64-unknown-linux-gnu${{ github.event.inputs.features && format('-{0}', github.event.inputs.features) || '' }}"
306+
if [ -f "./${BIN}" ]; then
307+
mv "./${BIN}" ./rbuilder
294308
echo "✅ Binary downloaded successfully"
295309
ls -lh ./rbuilder
296310
else
297311
echo "❌ Binary file not found after download"
298-
find . -name "rbuilder" -type f || echo "No rbuilder file found"
312+
ls -la
299313
exit 1
300314
fi
301315

0 commit comments

Comments
 (0)