Merge branch 'master' into jgrpp

azure-pipelines/templates/ci-git-rebase.yml

@@ -1,10 +0,0 @@
-steps:
-# Rebase to target branch for every PR. This means users don't have to
-# rebase every time target branch changes. As long as the PR applies cleanly, we
-# will validate it.
-- bash: |
-    git config user.email 'info@openttd.org'
-    git config user.name 'OpenTTD CI'
-    git rebase origin/${SYSTEM_PULLREQUEST_TARGETBRANCH}
-  displayName: 'Rebase to target branch'
-  condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))

azure-pipelines/templates/ci-opengfx.yml

@@ -1,13 +0,0 @@
-parameters:
-  SharedFolder: '/usr/local/share/games/openttd'
-  PrefixCommand: ''
-
-steps:
-- bash: |
-    set -ex
-    ${{ parameters.PrefixCommand }} mkdir -p "${{ parameters.SharedFolder }}/baseset"
-    cd "${{ parameters.SharedFolder }}/baseset"
-    ${{ parameters.PrefixCommand }} curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip
-    ${{ parameters.PrefixCommand }} unzip opengfx-all.zip
-    ${{ parameters.PrefixCommand }} rm -f opengfx-all.zip
-  displayName: 'Install OpenGFX'