From bef9e3fcfae897f28601844aad1ea45a6b900233 Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Tue, 29 Sep 2020 18:40:41 +0100 Subject: [PATCH] Remove: Old Azure Pipelines CI --- azure-pipelines-ci.yml | 93 --------------------- azure-pipelines/templates/ci-git-rebase.yml | 10 --- azure-pipelines/templates/ci-opengfx.yml | 13 --- 3 files changed, 116 deletions(-) delete mode 100644 azure-pipelines-ci.yml delete mode 100644 azure-pipelines/templates/ci-git-rebase.yml delete mode 100644 azure-pipelines/templates/ci-opengfx.yml diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml deleted file mode 100644 index 463d09b8b4..0000000000 --- a/azure-pipelines-ci.yml +++ /dev/null @@ -1,93 +0,0 @@ -trigger: -- master -- release/* -pr: -- master -- release/* - -jobs: -- job: windows - displayName: 'Windows' - pool: - vmImage: 'VS2017-Win2016' - - strategy: - matrix: - Win32: - BuildArch: 'Win32' - VcpkgTargetTriplet: 'x86-windows-static' - Win64: - BuildArch: 'x64' - VcpkgTargetTriplet: 'x64-windows-static' - - steps: - - template: azure-pipelines/templates/ci-git-rebase.yml - - template: azure-pipelines/templates/windows-dependencies.yml - - template: azure-pipelines/templates/ci-opengfx.yml - parameters: - SharedFolder: C:/Users/Public/Documents/OpenTTD - - template: azure-pipelines/templates/windows-build.yml - parameters: - BuildArch: $(BuildArch) - VcpkgTargetTriplet: $(VcpkgTargetTriplet) - BuildConfiguration: 'Debug' - - task: VSBuild@1 - displayName: 'Prepare regression files' - inputs: - solution: build/regression_files.vcxproj - configuration: 'Debug' - - task: VSBuild@1 - displayName: 'Test' - inputs: - solution: build/RUN_TESTS.vcxproj - configuration: 'Debug' - - -- job: linux - displayName: 'Linux' - pool: - vmImage: 'ubuntu-16.04' - - strategy: - matrix: - linux-amd64-clang-3.9: - Tag: 'linux-amd64-clang-3.9' - linux-amd64-gcc-6: - Tag: 'linux-amd64-gcc-6' - linux-i386-gcc-6: - Tag: 'linux-i386-gcc-6' - - steps: - - template: azure-pipelines/templates/ci-git-rebase.yml - # The dockers already have the dependencies installed - - template: azure-pipelines/templates/ci-opengfx.yml - parameters: - SharedFolder: /usr/local/share/games/openttd - PrefixCommand: sudo - - template: azure-pipelines/templates/linux-build.yml - parameters: - Image: compile-farm-ci - Tag: $(Tag) - -- job: macos - displayName: 'MacOS' - pool: - vmImage: 'macOS-10.14' - - variables: - MACOSX_DEPLOYMENT_TARGET: 10.9 - - steps: - - template: azure-pipelines/templates/ci-git-rebase.yml - - template: azure-pipelines/templates/osx-dependencies.yml - - template: azure-pipelines/templates/ci-opengfx.yml - parameters: - SharedFolder: /Library/Application Support/OpenTTD - PrefixCommand: sudo - - template: azure-pipelines/templates/osx-build.yml - - script: | - set -ex - - cd build - CTEST_OUTPUT_ON_FAILURE=1 make test - displayName: 'Test' diff --git a/azure-pipelines/templates/ci-git-rebase.yml b/azure-pipelines/templates/ci-git-rebase.yml deleted file mode 100644 index 96a23a5401..0000000000 --- a/azure-pipelines/templates/ci-git-rebase.yml +++ /dev/null @@ -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')) diff --git a/azure-pipelines/templates/ci-opengfx.yml b/azure-pipelines/templates/ci-opengfx.yml deleted file mode 100644 index 60231e3869..0000000000 --- a/azure-pipelines/templates/ci-opengfx.yml +++ /dev/null @@ -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'