[vcpkg] Add tombstone deletion scripts. (#11189)

4 files changed, 77 insertions, 51 deletions

diff --git a/scripts/azure-pipelines/clean-tombstones.yml b/scripts/azure-pipelines/clean-tombstones.yml
new file mode 100644
index 000000000..3acf736e1
--- /dev/null
+++ b/scripts/azure-pipelines/clean-tombstones.yml
@@ -0,0 +1,40 @@
+# Copyright (c) Microsoft Corporation.

+# SPDX-License-Identifier: MIT

+#

+variables:

+  windows-pool: 'PrWin-2020-04-28'

+  linux-pool: 'PrLin-2020-04-30'

+

+jobs:

+  - job: windows

+    displayName: 'Clean Windows Tombstones'

+    pool: $(windows-pool)

+    steps:

+    - task: PowerShell@2

+      displayName: 'Initialize Environment'

+      inputs:

+        filePath: 'scripts/azure-pipelines/windows/initialize-environment.ps1'

+    - script: rmdir /s /q archives\fail

+      displayName: 'Delete archives\fail'

+  - job: linux

+    displayName: 'Clean Linux Tombstones'

+    pool: $(linux-pool)

+    steps:

+    - task: Bash@3

+      displayName: 'Initialize Environment'

+      inputs:

+        filePath: scripts/azure-pipelines/linux/initialize-environment.sh

+    - bash: rm -rf archives/fail

+      displayName: 'Delete archives/fail'

+  - job: osx

+    displayName: 'Clean MacOS Tombstones'

+    pool:

+      name: vcpkgAgentPool

+      demands: Agent.OS -equals Darwin

+    steps:

+    - task: Bash@3

+      displayName: 'Initialize Environment'

+      inputs:

+        filePath: 'scripts/azure-pipelines/osx/initialize-environment.sh'

+    - bash: rm -rf archives/fail

+      displayName: 'Delete archives/fail'

diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml
index 0fe47a107..912339dfd 100644
--- a/scripts/azure-pipelines/osx/azure-pipelines.yml
+++ b/scripts/azure-pipelines/osx/azure-pipelines.yml
@@ -13,34 +13,10 @@ jobs:
       df -h

     displayName: 'Report on Disk Space Before Environment'

     condition: always()

-  - bash: |

-      rm -rf installed || true

-      mkdir -p ~/Data/installed || true

-      ln -s ~/Data/installed

-      rm -rf ~/Data/installed/* || true

-

-      rm -rf buildtrees || true

-      mkdir -p ~/Data/buildtrees || true

-      ln -s ~/Data/buildtrees

-      rm -rf ~/Data/buildtrees/* || true

-

-      rm -rf packages || true

-      mkdir -p ~/Data/packages || true

-      ln -s ~/Data/packages

-      rm -rf ~/Data/packages/* || true

-

-      rm archives || rm -rf archives || true

-      ln -s ~/Data/archives

-

-      rm -rf downloads || true

-      mkdir -p ~/Data/downloads || true

-      ln -s ~/Data/downloads

-

-      if [ -d downloads/ ]; then

-        #delete downloaded files that have not been used in 7 days

-        find downloads/  -maxdepth 1 -type f ! -atime 7  -exec rm -f {} \;

-      fi

-    displayName: 'Setup Environment'

+  - task: Bash@3

+    displayName: 'Initialize Environment'

+    inputs:

+      filePath: 'scripts/azure-pipelines/osx/initialize-environment.sh'

   - bash: |

       brew list autoconf || brew install autoconf

       brew list automake || brew install automake

diff --git a/scripts/azure-pipelines/osx/initialize-environment.sh b/scripts/azure-pipelines/osx/initialize-environment.sh
new file mode 100755
index 000000000..5eeba4255
--- /dev/null
+++ b/scripts/azure-pipelines/osx/initialize-environment.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Copyright (c) Microsoft Corporation.
+# SPDX-License-Identifier: MIT
+
+# Sets up the environment for MacOS runs of vcpkg CI
+
+rm -rf installed || true
+mkdir -p ~/Data/installed || true
+ln -s ~/Data/installed
+rm -rf ~/Data/installed/* || true
+
+rm -rf buildtrees || true
+mkdir -p ~/Data/buildtrees || true
+ln -s ~/Data/buildtrees
+rm -rf ~/Data/buildtrees/* || true
+
+rm -rf packages || true
+mkdir -p ~/Data/packages || true
+ln -s ~/Data/packages
+rm -rf ~/Data/packages/* || true
+
+rm archives || rm -rf archives || true
+ln -s ~/Data/archives
+
+rm -rf downloads || true
+mkdir -p ~/Data/downloads || true
+ln -s ~/Data/downloads
+
+if [ -d downloads/ ]; then
+#delete downloaded files that have not been used in 7 days
+find downloads/  -maxdepth 1 -type f ! -atime 7  -exec rm -f {} \;
+fi
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 5e17bb9e4..8e631f138 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -561,15 +561,9 @@ graphqlparser:x64-uwp=fail
 grpc:arm-uwp=fail

 gsl:arm-uwp=fail

 gsl:x64-uwp=fail

-# https://github.com/microsoft/vcpkg/pull/11048/files

-gsoap:arm-uwp=fail

-gsoap:arm64-windows=fail

+# https://github.com/microsoft/vcpkg/pull/11048

 gsoap:x64-linux=fail

 gsoap:x64-osx=fail

-gsoap:x64-uwp=fail

-gsoap:x64-windows-static=fail

-gsoap:x64-windows=fail

-gsoap:x86-windows=fail

 gtk:x64-linux=fail

 gtk:x86-windows=ignore

 guetzli:x64-osx=fail

@@ -1120,11 +1114,6 @@ mozjpeg:x64-uwp            = skip
 mozjpeg:x64-windows        = skip

 mozjpeg:x64-windows-static = skip

 mozjpeg:x86-windows        = skip

-# mp3lame emits error LNK2019: unresolved external symbol __imp_RoInitialize referenced in function

-# __scrt_initialize_winrt; likely missing an import library

-mp3lame:arm-uwp=fail

-mp3lame:arm64-uwp=fail

-mp3lame:x64-uwp=fail

 mpg123:arm-uwp=fail

 mpg123:x64-uwp=fail

 mpir:arm64-windows=fail

@@ -1355,12 +1344,6 @@ pangomm:x86-windows=ignore
 pangomm:arm64-windows=fail

 parmetis:x64-linux=fail

 parmetis:x64-osx=fail

-# https://github.com/microsoft/vcpkg/issues/11050

-pbc:arm-uwp=fail

-pbc:x86-windows=fail

-pbc:x64-windows=fail

-pbc:x64-uwp=fail

-pbc:x64-windows-static=fail

 pcre2:arm-uwp=fail

 pdal:x64-linux=fail

 pdal:x64-osx=fail

@@ -1415,7 +1398,6 @@ pmdk:x64-linux=fail
 pmdk:x64-osx=fail

 pmdk:x64-uwp=fail

 pmdk:x64-windows-static=fail

-pmdk:x64-windows=fail

 pmdk:x86-windows=fail

 pngwriter:arm-uwp=fail

 pngwriter:x64-uwp=fail

@@ -1627,11 +1609,7 @@ sdl2-net:arm-uwp=fail
 sdl2-net:x64-uwp=fail

 # https://github.com/microsoft/vcpkg/issues/10918

 seal:arm-uwp=fail

-seal:arm64-windows=fail

 seal:x64-uwp=fail

-seal:x64-windows-static=fail

-seal:x64-windows=fail

-seal:x86-windows=fail

 secp256k1:x64-linux=fail

 secp256k1:x64-osx=fail

 selene:x64-linux=ignore