@@ -32,7 +32,7 @@ stages:
32
32
- release
33
33
- docker-manifest-release
34
34
- xray-scan
35
- - github -release
35
+ - publish -release
36
36
37
37
include :
38
38
- project : ' prodsec/scp-scanning/gitlab-checkmarx'
@@ -1563,7 +1563,7 @@ release-installers:
1563
1563
before_script :
1564
1564
- cp -f dist/signed/install.ps1 packaging/installer/install.ps1
1565
1565
1566
- choco -release :
1566
+ nupkg -release :
1567
1567
extends : .trigger-filter
1568
1568
stage : release
1569
1569
dependencies :
@@ -1582,14 +1582,33 @@ choco-release:
1582
1582
}
1583
1583
.\packaging\choco\make.ps1 build_choco -Version $version -BuildDir .\dist\signed
1584
1584
- Test-Path .\dist\signed\splunk-otel-collector.${version}.nupkg
1585
+ artifacts :
1586
+ paths :
1587
+ - dist/signed/*.nupkg
1588
+
1589
+ choco-release :
1590
+ extends : .trigger-filter
1591
+ stage : publish-release
1592
+ dependencies :
1593
+ - nupkg-release
1594
+ tags :
1595
+ - splunk-otel-collector-windows
1596
+ script :
1597
+ - |
1598
+ $ErrorActionPreference = 'Stop'
1599
+ Set-PSDebug -Trace 1
1600
+ $msi_file_name = Resolve-Path .\dist\signed\splunk-otel-collector*.msi | Split-Path -leaf
1601
+ if ($msi_file_name -match '(\d+\.\d+\.\d+)(\.\d+)?') {
1602
+ $version = $matches[0]
1603
+ } else {
1604
+ throw "Failed to get version from $msi_file_name"
1605
+ }
1606
+ - Test-Path .\dist\signed\splunk-otel-collector.${version}.nupkg
1585
1607
- |
1586
1608
# Only push the choco package for stable release tags
1587
1609
if ($env:CI_COMMIT_TAG -match '^v\d+\.\d+\.\d+$') {
1588
1610
choco push -k $env:CHOCO_TOKEN .\dist\signed\splunk-otel-collector.${version}.nupkg
1589
1611
}
1590
- artifacts :
1591
- paths :
1592
- - dist/signed/*.nupkg
1593
1612
1594
1613
push-multiarch-manifest :
1595
1614
extends : .trigger-filter
@@ -1752,7 +1771,7 @@ github-release:
1752
1771
- .trigger-filter
1753
1772
- .go-cache
1754
1773
tags : [large]
1755
- stage : github -release
1774
+ stage : publish -release
1756
1775
dependencies :
1757
1776
- compile
1758
1777
- otelcol-fips
@@ -1764,7 +1783,6 @@ github-release:
1764
1783
- sign-msi
1765
1784
- sign-tar
1766
1785
- push-multiarch-manifest
1767
- - choco-release
1768
1786
- sign-agent-bundles
1769
1787
script :
1770
1788
- mkdir -p dist/assets
@@ -1926,7 +1944,7 @@ dotnet-instrumentation-deployer-release:
1926
1944
- .trigger-dotnet-instrumentation-deployer
1927
1945
- .go-cache # Use this image since this job uses the ghr tool
1928
1946
tags : [large]
1929
- stage : github -release
1947
+ stage : publish -release
1930
1948
dependencies :
1931
1949
- pack-dotnet-instrumentation-deployer
1932
1950
script :
0 commit comments