Skip to content

Commit 0565b6a

Browse files
authored
Keep git info for crate publishing. (#66)
1 parent 4fbf5d5 commit 0565b6a

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

azure-pipelines.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,16 @@ stages:
188188
displayName: Update crate version
189189
condition: and(succeeded(), eq(variables['target'], 'x86_64-apple-darwin'))
190190
191+
- task: ArchiveFiles@2
192+
displayName: Pack source folder for crate publishing
193+
condition: and(succeeded(), eq(variables['target'], 'x86_64-unknown-linux-gnu'))
194+
inputs:
195+
rootFolderOrFile: '$(Build.SourcesDirectory)'
196+
archiveType: '7z'
197+
archiveFile: '$(Build.ArtifactStagingDirectory)/crate/rnp.source.7z'
198+
191199
- task: CopyFiles@2
192-
displayName: Copy code for crate publishing
200+
displayName: Copy code for source code publishing
193201
condition: and(succeeded(), eq(variables['target'], 'x86_64-unknown-linux-gnu'))
194202
inputs:
195203
sourceFolder: '$(Build.SourcesDirectory)'
@@ -205,28 +213,21 @@ stages:
205213
Contents: '.git'
206214

207215
- task: ArchiveFiles@2
208-
displayName: Pack source as zip for crate publishing
216+
displayName: Pack source as zip for source code publishing
209217
condition: and(succeeded(), eq(variables['target'], 'x86_64-unknown-linux-gnu'))
210218
inputs:
211219
rootFolderOrFile: '$(System.DefaultWorkingDirectory)/staging/crate'
212220
archiveType: 'zip'
213-
archiveFile: '$(Build.ArtifactStagingDirectory)/crate/rnp.source.$(build.tag).zip'
221+
archiveFile: '$(Build.ArtifactStagingDirectory)/source/rnp.source.$(build.tag).zip'
214222

215223
- task: ArchiveFiles@2
216-
displayName: Pack source as tar.gz for crate publishing
224+
displayName: Pack source as tar.gz for source publishing
217225
condition: and(succeeded(), eq(variables['target'], 'x86_64-unknown-linux-gnu'))
218226
inputs:
219227
rootFolderOrFile: '$(System.DefaultWorkingDirectory)/staging/crate'
220228
archiveType: 'tar'
221229
tarCompression: 'gz'
222-
archiveFile: '$(Build.ArtifactStagingDirectory)/crate/rnp.source.$(build.tag).tar.gz'
223-
224-
- task: CopyFiles@2
225-
displayName: Copy chocolatey template to output
226-
condition: and(succeeded(), eq(variables['target'], 'x86_64-unknown-linux-gnu'))
227-
inputs:
228-
sourceFolder: '$(Build.SourcesDirectory)/build/templates/chocolatey'
229-
targetFolder: '$(Build.ArtifactStagingDirectory)/chocolatey'
230+
archiveFile: '$(Build.ArtifactStagingDirectory)/source/rnp.source.$(build.tag).tar.gz'
230231

231232
#
232233
# Running all tests
@@ -315,7 +316,7 @@ stages:
315316
#
316317
- task: PublishPipelineArtifact@1
317318
displayName: Publish pipeline artifact
318-
condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
319+
# condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
319320
inputs:
320321
targetPath: '$(Build.ArtifactStagingDirectory)'
321322

build/pack/PackReleasePackages.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,11 @@ function PackRustCrate() {
122122
New-Item -ItemType Directory -Path ".\Releases\Crate.io"
123123
Write-Host "Pack source as crate to .\Releases\Crate.io"
124124
Copy-Item -Path .\Build.Build.linuxx64\crate\* .\Releases\Crate.io -Verbose -Force
125-
125+
}
126+
127+
function PackSourcePackages() {
126128
Write-Host "Publish source packages to .\Releases\GithubReleases"
127-
Copy-Item -Path .\Build.Build.linuxx64\crate\* .\Releases\GithubReleases -Verbose -Force
129+
Copy-Item -Path .\Build.Build.linuxx64\source\* .\Releases\GithubReleases -Verbose -Force
128130
}
129131

130132
# Chocolatey

0 commit comments

Comments
 (0)