diff options
| author | Patric Stout <truebrain@openttd.org> | 2019-02-09 20:13:28 +0100 |
|---|---|---|
| committer | Patric Stout <truebrain@openttd.org> | 2019-02-09 21:38:40 +0100 |
| commit | 13b7e8774d813ab84a8e58f3d629e6e9ab3b8765 (patch) | |
| tree | ee191d0b18c9c7b94e6813541ce9a6dcb325dc6b | |
| parent | 0151fe998a999b48b67afa5b96d9a4cd72246455 (diff) | |
| download | openttd-13b7e8774d813ab84a8e58f3d629e6e9ab3b8765.tar.xz | |
Fix: [AzurePipelines] manifest.sh didn't know when it was a stable release
In result, the name of the release was wrong, causing confusing
in tools using the manifest.yaml.
| -rwxr-xr-x | azure-pipelines/manifest.sh | 2 | ||||
| -rw-r--r-- | azure-pipelines/templates/release-manifest.yml | 7 | ||||
| -rw-r--r-- | azure-pipelines/templates/release.yml | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/azure-pipelines/manifest.sh b/azure-pipelines/manifest.sh index 4d1197277..d8f4f9aac 100755 --- a/azure-pipelines/manifest.sh +++ b/azure-pipelines/manifest.sh @@ -15,7 +15,7 @@ if [ ! -e .version ] || [ ! -e .release_date ]; then fi # Find the name based on the version -if [ "${ISSTABLERELEASE}" = "true" ]; then +if [ -e .is_stable ]; then isTesting=$(cat .version | grep "RC\|beta" || true) if [ -z "${isTesting}" ]; then NAME="stable" diff --git a/azure-pipelines/templates/release-manifest.yml b/azure-pipelines/templates/release-manifest.yml index 5c076b30e..9e8b486d5 100644 --- a/azure-pipelines/templates/release-manifest.yml +++ b/azure-pipelines/templates/release-manifest.yml @@ -1,3 +1,6 @@ +parameters: + IsStableRelease: false + steps: - task: DownloadBuildArtifacts@0 displayName: 'Download all bundles' @@ -5,6 +8,10 @@ steps: downloadType: specific itemPattern: 'bundles/*' downloadPath: '$(Build.ArtifactStagingDirectory)' +- ${{ if eq(parameters.IsStableRelease, true) }}: + - script: | + touch .is_stable + displayName: 'Mark as stable release' - script: | set -ex ./azure-pipelines/manifest.sh ../a/bundles/ diff --git a/azure-pipelines/templates/release.yml b/azure-pipelines/templates/release.yml index 4daf66ded..86f2be40e 100644 --- a/azure-pipelines/templates/release.yml +++ b/azure-pipelines/templates/release.yml @@ -164,6 +164,9 @@ jobs: steps: - template: release-fetch-source.yml - template: release-manifest.yml + ${{ if eq(parameters.IsStableRelease, true) }}: + parameters: + IsStableRelease: true - template: release-bundles.yml parameters: CalculateChecksums: false |