Skip to content

Commit 03ad94e

Browse files
committed
remove git version from build-plugin workflow
1 parent cc3b225 commit 03ad94e

File tree

1 file changed

+12
-24
lines changed

1 file changed

+12
-24
lines changed

.github/workflows/build-project.yaml

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,8 @@ jobs:
108108
local product_version
109109
read -r product_name <<< \
110110
"$(jq -r '.name' buildspec.json)"
111-
read -r product_version <<< \
112-
"$(git describe --always --tags --dirty=-modified)"
113111
114112
print "pluginName=${product_name}" >> $GITHUB_OUTPUT
115-
print "pluginVersion=${product_version}" >> $GITHUB_OUTPUT
116113
117114
- uses: actions/cache/restore@v4
118115
id: ccache-cache
@@ -161,15 +158,15 @@ jobs:
161158
- name: Upload Artifacts 📡
162159
uses: actions/upload-artifact@v4
163160
with:
164-
name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-macos-universal-${{ needs.check-event.outputs.commitHash }}
165-
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-macos-universal.*
161+
name: ${{ steps.setup.outputs.pluginName }}-macos-universal-${{ needs.check-event.outputs.commitHash }}
162+
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-macos-universal.*
166163

167164
- name: Upload Debug Symbol Artifacts 🪲
168165
uses: actions/upload-artifact@v4
169166
if: ${{ needs.check-event.outputs.config == 'Release' }}
170167
with:
171-
name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-macos-universal-${{ needs.check-event.outputs.commitHash }}-dSYMs
172-
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-macos-universal-dSYMs.*
168+
name: ${{ steps.setup.outputs.pluginName }}-macos-universal-${{ needs.check-event.outputs.commitHash }}-dSYMs
169+
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-macos-universal-dSYMs.*
173170

174171
- uses: actions/cache/save@v4
175172
if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
@@ -201,11 +198,7 @@ jobs:
201198
202199
read -r product_name <<< \
203200
"$(jq -r '.name' buildspec.json)"
204-
read -r product_version <<< \
205-
"$(git describe --always --tags --dirty=-modified)"
206-
207201
echo "pluginName=${product_name}" >> $GITHUB_OUTPUT
208-
echo "pluginVersion=${product_version}" >> $GITHUB_OUTPUT
209202
210203
- uses: actions/cache/restore@v4
211204
id: ccache-cache
@@ -231,21 +224,21 @@ jobs:
231224
- name: Upload Source Tarball 🗜️
232225
uses: actions/upload-artifact@v4
233226
with:
234-
name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-${{ matrix.os }}-sources-${{ needs.check-event.outputs.commitHash }}
235-
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-source.*
227+
name: ${{ steps.setup.outputs.pluginName }}-${{ matrix.os }}-sources-${{ needs.check-event.outputs.commitHash }}
228+
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-source.*
236229

237230
- name: Upload Artifacts 📡
238231
uses: actions/upload-artifact@v4
239232
with:
240-
name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-${{ matrix.os }}-x86_64-${{ needs.check-event.outputs.commitHash }}
241-
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-x86_64*.*
233+
name: ${{ steps.setup.outputs.pluginName }}-${{ matrix.os }}-x86_64-${{ needs.check-event.outputs.commitHash }}
234+
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-x86_64*.*
242235

243236
- name: Upload debug symbol artifacts 🪲
244237
uses: actions/upload-artifact@v4
245238
if: ${{ fromJSON(needs.check-event.outputs.package) }}
246239
with:
247-
name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-${{ matrix.os }}-x86_64-${{ needs.check-event.outputs.commitHash }}-dbgsym
248-
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-x86_64*-dbgsym.ddeb
240+
name: ${{ steps.setup.outputs.pluginName }}-${{ matrix.os }}-x86_64-${{ needs.check-event.outputs.commitHash }}-dbgsym
241+
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-x86_64*-dbgsym.ddeb
249242

250243
- uses: actions/cache/save@v4
251244
if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
@@ -276,12 +269,7 @@ jobs:
276269
277270
$BuildSpec = Get-Content -Path buildspec.json -Raw | ConvertFrom-Json
278271
$ProductName = $BuildSpec.name
279-
$GitDescription = Invoke-External git describe --tags --long
280-
$Tokens = ($GitDescription -split '-')
281-
$ProductVersion = $Tokens[0..$($Tokens.Count - 3)] -join '-'
282-
283272
"pluginName=${ProductName}" >> $env:GITHUB_OUTPUT
284-
"pluginVersion=${ProductVersion}" >> $env:GITHUB_OUTPUT
285273
286274
- name: Build Plugin 🧱
287275
uses: ./.github/actions/build-plugin
@@ -299,5 +287,5 @@ jobs:
299287
- name: Upload Artifacts 📡
300288
uses: actions/upload-artifact@v4
301289
with:
302-
name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-windows-x64-${{ needs.check-event.outputs.commitHash }}
303-
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-windows-x64*.*
290+
name: ${{ steps.setup.outputs.pluginName }}-windows-x64-${{ needs.check-event.outputs.commitHash }}
291+
path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-windows-x64*.*

0 commit comments

Comments
 (0)