From 9d7fe0893140949df2c6e79d48a57e6acaad8404 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Thu, 17 Sep 2020 15:37:45 +0200 Subject: [PATCH] Use git tag for archive versioning --- azure-pipelines/pi64.yml | 8 ++++++-- azure-pipelines/rpi1-sdl2.yml | 8 ++++++-- azure-pipelines/rpi1.yml | 8 ++++++-- azure-pipelines/rpi2-sdl2.yml | 8 ++++++-- azure-pipelines/rpi2.yml | 8 ++++++-- azure-pipelines/rpi3-sdl2.yml | 8 ++++++-- azure-pipelines/rpi3.yml | 8 ++++++-- azure-pipelines/rpi4-sdl2.yml | 8 ++++++-- azure-pipelines/rpi4.yml | 8 ++++++-- 9 files changed, 54 insertions(+), 18 deletions(-) diff --git a/azure-pipelines/pi64.yml b/azure-pipelines/pi64.yml index 2a4e45db..27282e0f 100644 --- a/azure-pipelines/pi64.yml +++ b/azure-pipelines/pi64.yml @@ -2,8 +2,12 @@ steps: - checkout: self submodules: true + path: pi64 + + - script: VERSION_TAG=`git describe --abbrev=0` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG" + displayName: Set the tag name as an environment variable + - script: | - make clean cd external/capsimg ./bootstrap.fs ./configure.fs @@ -32,7 +36,7 @@ steps: inputs: rootFolderOrFile: 'amiberry-rpi4-64bit' includeRootFolder: true - archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(AmiberryVersion)-rpi4-64bit.zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi4-64bit.zip' - task: PublishBuildArtifacts@1 inputs: diff --git a/azure-pipelines/rpi1-sdl2.yml b/azure-pipelines/rpi1-sdl2.yml index 51c7d1dd..d15125d2 100644 --- a/azure-pipelines/rpi1-sdl2.yml +++ b/azure-pipelines/rpi1-sdl2.yml @@ -2,8 +2,12 @@ steps: - checkout: self submodules: true + path: rpi1-sdl2 + + - script: VERSION_TAG=`git describe --abbrev=0` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG" + displayName: Set the tag name as an environment variable + - script: | - make clean cd external/capsimg ./bootstrap.fs ./configure.fs @@ -32,7 +36,7 @@ steps: inputs: rootFolderOrFile: 'amiberry-rpi1-sdl2-32bit' includeRootFolder: true - archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(AmiberryVersion)-rpi1-sdl2-32bit.zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi1-sdl2-32bit.zip' - task: PublishBuildArtifacts@1 inputs: diff --git a/azure-pipelines/rpi1.yml b/azure-pipelines/rpi1.yml index a2083ee5..ca31e3fa 100644 --- a/azure-pipelines/rpi1.yml +++ b/azure-pipelines/rpi1.yml @@ -2,8 +2,12 @@ steps: - checkout: self submodules: true + path: rpi1-dmx + + - script: VERSION_TAG=`git describe --abbrev=0` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG" + displayName: Set the tag name as an environment variable + - script: | - make clean cd external/capsimg ./bootstrap.fs ./configure.fs @@ -32,7 +36,7 @@ steps: inputs: rootFolderOrFile: 'amiberry-rpi1-dmx-32bit' includeRootFolder: true - archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(AmiberryVersion)-rpi1-dmx-32bit.zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi1-dmx-32bit.zip' - task: PublishBuildArtifacts@1 inputs: diff --git a/azure-pipelines/rpi2-sdl2.yml b/azure-pipelines/rpi2-sdl2.yml index 2374faf5..aa6cb803 100644 --- a/azure-pipelines/rpi2-sdl2.yml +++ b/azure-pipelines/rpi2-sdl2.yml @@ -2,8 +2,12 @@ steps: - checkout: self submodules: true + path: rpi2-sdl2 + + - script: VERSION_TAG=`git describe --abbrev=0` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG" + displayName: Set the tag name as an environment variable + - script: | - make clean cd external/capsimg ./bootstrap.fs ./configure.fs @@ -32,7 +36,7 @@ steps: inputs: rootFolderOrFile: 'amiberry-rpi2-sdl2-32bit' includeRootFolder: true - archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(AmiberryVersion)-rpi2-sdl2-32bit.zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi2-sdl2-32bit.zip' - task: PublishBuildArtifacts@1 inputs: diff --git a/azure-pipelines/rpi2.yml b/azure-pipelines/rpi2.yml index 2779ffa5..ebe9115e 100644 --- a/azure-pipelines/rpi2.yml +++ b/azure-pipelines/rpi2.yml @@ -2,8 +2,12 @@ steps: - checkout: self submodules: true + path: rpi2-dmx + + - script: VERSION_TAG=`git describe --abbrev=0` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG" + displayName: Set the tag name as an environment variable + - script: | - make clean cd external/capsimg ./bootstrap.fs ./configure.fs @@ -32,7 +36,7 @@ steps: inputs: rootFolderOrFile: 'amiberry-rpi2-dmx-32bit' includeRootFolder: true - archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(AmiberryVersion)-rpi2-dmx-32bit.zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi2-dmx-32bit.zip' - task: PublishBuildArtifacts@1 inputs: diff --git a/azure-pipelines/rpi3-sdl2.yml b/azure-pipelines/rpi3-sdl2.yml index 018eca31..c2193089 100644 --- a/azure-pipelines/rpi3-sdl2.yml +++ b/azure-pipelines/rpi3-sdl2.yml @@ -2,8 +2,12 @@ steps: - checkout: self submodules: true + path: rpi3-sdl2 + + - script: VERSION_TAG=`git describe --abbrev=0` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG" + displayName: Set the tag name as an environment variable + - script: | - make clean cd external/capsimg ./bootstrap.fs ./configure.fs @@ -32,7 +36,7 @@ steps: inputs: rootFolderOrFile: 'amiberry-rpi3-sdl2-32bit' includeRootFolder: true - archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(AmiberryVersion)-rpi3-sdl2-32bit.zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi3-sdl2-32bit.zip' - task: PublishBuildArtifacts@1 inputs: diff --git a/azure-pipelines/rpi3.yml b/azure-pipelines/rpi3.yml index 283f2bc3..38b9b1c9 100644 --- a/azure-pipelines/rpi3.yml +++ b/azure-pipelines/rpi3.yml @@ -2,8 +2,12 @@ steps: - checkout: self submodules: true + path: rpi3-dmx + + - script: VERSION_TAG=`git describe --abbrev=0` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG" + displayName: Set the tag name as an environment variable + - script: | - make clean cd external/capsimg ./bootstrap.fs ./configure.fs @@ -32,7 +36,7 @@ steps: inputs: rootFolderOrFile: 'amiberry-rpi3-dmx-32bit' includeRootFolder: true - archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(AmiberryVersion)-rpi3-dmx-32bit.zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi3-dmx-32bit.zip' - task: PublishBuildArtifacts@1 inputs: diff --git a/azure-pipelines/rpi4-sdl2.yml b/azure-pipelines/rpi4-sdl2.yml index 2dcd1e9f..c08887ee 100644 --- a/azure-pipelines/rpi4-sdl2.yml +++ b/azure-pipelines/rpi4-sdl2.yml @@ -2,8 +2,12 @@ steps: - checkout: self submodules: true + path: rpi4-sdl2 + + - script: VERSION_TAG=`git describe --abbrev=0` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG" + displayName: Set the tag name as an environment variable + - script: | - make clean cd external/capsimg ./bootstrap.fs ./configure.fs @@ -32,7 +36,7 @@ steps: inputs: rootFolderOrFile: 'amiberry-rpi4-sdl2-32bit' includeRootFolder: true - archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(AmiberryVersion)-rpi4-sdl2-32bit.zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi4-sdl2-32bit.zip' - task: PublishBuildArtifacts@1 inputs: diff --git a/azure-pipelines/rpi4.yml b/azure-pipelines/rpi4.yml index 10b16161..53899ea1 100644 --- a/azure-pipelines/rpi4.yml +++ b/azure-pipelines/rpi4.yml @@ -2,8 +2,12 @@ steps: - checkout: self submodules: true + path: rpi4-dmx + + - script: VERSION_TAG=`git describe --abbrev=0` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG" + displayName: Set the tag name as an environment variable + - script: | - make clean cd external/capsimg ./bootstrap.fs ./configure.fs @@ -32,7 +36,7 @@ steps: inputs: rootFolderOrFile: 'amiberry-rpi4-dmx-32bit' includeRootFolder: true - archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(AmiberryVersion)-rpi4-dmx-32bit.zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi4-dmx-32bit.zip' - task: PublishBuildArtifacts@1 inputs: