Update: Add changelog for 1.9.0-beta2 and prepare for release

In result, the name of the release was wrong, causing confusing
in tools using the manifest.yaml.

Makefile.src.in

@@ -90,7 +90,7 @@ MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')
 # Use autodetected revisions
 VERSION  := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
 ISODATE  := $(shell echo "$(VERSIONS)" | cut -f 2 -d'	')
-GITHASH  := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')
+GITHASH  := $(shell echo "$(VERSIONS)" | cut -f 4 -d'	')
 
 # Make sure we have something in VERSION and ISODATE
 ifeq ($(VERSION),)

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"

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/

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

changelog.txt

@@ -1,3 +1,7 @@
+1.9.0-beta2 (2018-02-09)
+------------------------------------------------------------------------
+- Fix: Non-Windows builds did not get correct git hash
+
 1.9.0-beta1 (2018-02-09)
 ------------------------------------------------------------------------
 Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbers have been replaced with Pull Requests and Issue numbers

known-bugs.txt

@@ -1,6 +1,6 @@
 OpenTTD's known bugs
 Last updated:    2019-02-09
-Release version: 1.9.0-beta1
+Release version: 1.9.0-beta2
 ------------------------------------------------------------------------
 
 

os/debian/changelog

@@ -1,3 +1,9 @@
+openttd (1.9.0~beta2-0) unstable; urgency=low
+
+  * New upstream release 1.9.0-beta2
+
+ -- OpenTTD <info@openttd.org>  Sat, 09 Feb 2019 23:00:00 +0000
+
 openttd (1.9.0~beta1-0) unstable; urgency=low
 
   * New upstream release 1.9.0-beta1

os/rpm/openttd.spec

@@ -17,9 +17,9 @@
 #
 
 Name:           openttd
-Version:        1.9.beta1
+Version:        1.9.beta2
 Release:        0
-%define srcver  1.9.0-beta1
+%define srcver  1.9.0-beta2
 Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
 License:        GPL-2.0
 Group:          Amusements/Games/Strategy/Other

os/windows/installer/install.nsi

@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 9
 !define APPV_MAINT 0
-!define APPV_BUILD 0
-!define APPV_EXTRA "-beta1"
+!define APPV_BUILD 1
+!define APPV_EXTRA "-beta2"
 
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version