Skip to content

Commit

Permalink
Use Build artifacts instead of Pipeline artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
CreepPork committed Mar 15, 2019
1 parent 994fc72 commit ddbef7d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,11 @@ release: clean version commit

releaseCI: clean version
@"$(MAKE)" $(MAKEFLAGS) signatures
@echo " ZIP release/$(ZIP)_$(VERSION_F).zip"
@echo " ZIP $(ZIP)_$(VERSION_F).zip"
@cp mod.cpp README.md AUTHORS.txt LICENSE logo_achilles_ca.paa $(BIN)
@mkdir release -p
@zip -qr release/$(ZIP)_$(VERSION_F)-$(GIT_HASH).zip $(BIN)
@zip -qr $(ZIP)_$(VERSION_F)-$(GIT_HASH).zip $(BIN)

clean:
rm -rf $(BIN) release/$(ZIP)_*.zip $(ZIP)_*.zip
rm -rf $(BIN) $(ZIP)_*.zip

.PHONY: all filepatching signatures extensions extensions-win64 version commit push release releaseCI clean
13 changes: 8 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,27 @@ jobs:
- script: |
make releaseCI
mv $(ls *.zip | head -n1) $(Build.ArtifactStagingDirectory)/$(ls *.zip | head -n1)
displayName: 'Build with armake'
- task: PublishPipelineArtifact@0
- task: PublishBuildArtifacts@0
inputs:
artifactName: 'releaseZip'
targetPath: $(System.DefaultWorkingDirectory)/release
pathtoPublish: $(Build.ArtifactStagingDirectory)

- job: Release
dependsOn:
- Test
- Build
steps:
- task: DownloadPipelineArtifact@0
- task: DownloadBuildArtifacts@0
inputs:
buildType: 'current'
downloadType: 'single'
artifactName: 'releaseZip'
targetPath: $(System.DefaultWorkingDirectory)/release
pathtoPublish: $(Build.ArtifactStagingDirectory)

- script: |
cd releases/
cd $(Build.ArtifactStagingDirectory)/releaseZip
"curl -F 'zip=@$(ls *.zip | head -n1)' -F 'accessToken=$(access.token)' $(access.url)"
displayName: 'Upload files'

0 comments on commit ddbef7d

Please sign in to comment.