Skip to content

Commit

Permalink
Use GitHub Actions rather than Azure DevOps except macOS.
Browse files Browse the repository at this point in the history
This reduces the vcpkg team's compliance burden as we won't be
maintaining a separate Azure DevOps instance, and results in a better
user experience for contributors as they need not go through so many
clicks in order to get build logs.

macOS isn't moved over yet because there's value in having all the Azure
resources on their own and that's going to be its own can of worms.

Also adds arm64-windows-static-md testing as requested by
Azure Storage internal customers.
  • Loading branch information
BillyONeal committed Nov 9, 2024
1 parent 813a241 commit 746d235
Show file tree
Hide file tree
Showing 34 changed files with 181 additions and 402 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

$Date = (Get-Date -Format 'yyyy-MM-dd')
$ResourceGroupName = "PrAnd-1ES"
$ContainerRegistryName = "vcpkgandroidwus3"
$ContainerRegistryName = "vcpkgandroidwus"
$ErrorActionPreference = 'Stop'

$registry = Get-AzContainerRegistry -ResourceGroupName $ResourceGroupName -Name $ContainerRegistryName
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"C++ VCPKG Validation" about vulnerable software we are installing in the VMs and update that.
(Most often PowerShell needs to be updated)
* [ ] Check for any other software for the Windows images we wish to update and make the edits to do
so in `scripts/azure-pipelines/windows`
so in `.github/windows`
* [ ] Check for any updates possible to `vcpkgTools.xml`. Note that PowerShell currently uses the
7.2.x series due to customer reported problems on older Windows with 7.3.x and later.
* [ ] Update the first line of android/Dockerfile with the current 'focal' image according to
Expand All @@ -22,4 +22,4 @@
* [ ] In the Azure portal, mark the newly created image as the 'latest' one.
* [ ] Mint a new macOS base box. (See instructions in `scripts/azure-pipelines/osx/README.md`)
* [ ] Deploy the new base box to all hosts.
* [ ] Update the software on the CTI's machine #12 to match.
* [ ] Update the software on the CTI's machine #1 to match.
184 changes: 176 additions & 8 deletions .github/workflows/test_modified_ports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,189 @@ on:
push:
branches:
- onboard-actions
pull_request:
schedule:
- cron: "0 4 * * 1,3,5"
permissions:
id-token: write
contents: read
jobs:
Windows:
test:
strategy:
matrix:
conf:
- triplet: 'arm64-windows'
pool: windows
- triplet: 'arm64-windows-static-md'
pool: windows
- triplet: 'arm64-uwp'
pool: windows
- triplet: 'x86-windows'
pool: windows
extra-checks: true
- triplet: 'x64-windows'
pool: windows
- triplet: 'x64-windows-static'
pool: windows
- triplet: 'x64-windows-static-md'
pool: windows
- triplet: 'x64-uwp'
pool: windows
- triplet: 'x64-linux'
pool: linux
- triplet: 'arm-neon-android'
pool: android
- triplet: 'x64-android'
pool: android
- triplet: 'arm64-android'
pool: android
runs-on:
- self-hosted
- "1ES.Pool=vcpkg-windows-wus"
- "1ES.Pool=${{ matrix.conf.pool == 'windows' && 'vcpkg-windows-ephemeral-wus' || matrix.conf.pool == 'linux' && 'vcpkg-linux-ephemeral-wus' || matrix.conf.pool == 'android' && 'vcpkg-android-ephemeral-wus' }}"
continue-on-error: true
timeout-minutes: 2880 # 2 days
env:
VCPKG_DOWNLOADS: ${{ matrix.conf.pool == 'windows' && 'D:\downloads' || '/mnt/vcpkg-ci/downloads' }}
WORKING_ROOT: ${{ matrix.conf.pool == 'windows' && 'D:\' || '/mnt/vcpkg-ci' }}
ARTIFACT_STAGING: ${{ matrix.conf.pool == 'windows' && 'D:\artifactstaging' || '/mnt/vcpkg-ci/artifactstaging' }}
steps:
- name: Checkout
- name: Make Working Directories (Windows)
if: ${{ success() && matrix.conf.pool == 'windows' }}
run: |
mkdir D:\downloads
mkdir D:\artifactstaging
- name: Make Working Directories (non-Windows)
if: ${{ success() && matrix.conf.pool != 'windows' }}
run: |
sudo mkdir ${{ env.WORKING_ROOT }} -m=777
sudo mkdir ${{ env.WORKING_ROOT }}/failure-logs -m=777
sudo mkdir ${{ env.VCPKG_DOWNLOADS }} -m=777
sudo mkdir ${{ env.ARTIFACT_STAGING }} -m=777
- name: Checkout (Windows)
uses: actions/checkout@v4
if: ${{ success() && matrix.conf.pool == 'windows' }}
env:
PATH: c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\cmd;$PATH
with:
# fetch-depth 50 tries to ensure we capture the whole history of the branch
fetch-depth: 50
- name: Checkout (Non-Windows)
uses: actions/checkout@v4
if: ${{ success() && matrix.conf.pool != 'windows' }}
with:
# fetch-depth 50 tries to ensure we capture the whole history of the branch
fetch-depth: 50
- name: Azure Login
uses: azure/login@v2
with:
client-id: a81b4cd3-9d8d-4cb9-9a74-f2038f24f224
subscription-id: 7fcb00fa-a761-49de-8a2f-d67190e62882
tenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
- name: Bootstrap (Windows)
if: ${{ success() && matrix.conf.pool == 'windows' }}
run: ./scripts/bootstrap.ps1
- name: Bootstrap (Non-Windows)
if: ${{ success() && matrix.conf.pool != 'windows' && matrix.conf.pool != 'android' }}
run: ./scripts/bootstrap.sh
- name: Format Manifests
if: ${{ success() && matrix.conf.extra-checks }}
run: ./vcpkg.exe format-manifest --all
- name: Create Format Manifest Diff
if: ${{ success() && matrix.conf.extra-checks }}
env:
PATH: c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\cmd;$PATH
run: ./scripts/azure-pipelines/Create-PRDiff.ps1 -DiffFile "${{ env.ARTIFACT_STAGING }}/format.diff"
- name: 'Publish Artifact: Format Diff'
uses: actions/upload-artifact@v4
if: ${{ failure() && !cancelled() && matrix.conf.extra-checks }}
with:
name: 'format.diff'
path: "${{ env.ARTIFACT_STAGING }}/format.diff"
retention-days: 7
if-no-files-found: error
- name: "*** Test Modified Ports (non-Android)"
if: ${{ success() && matrix.conf.pool != 'android' }}
shell: pwsh
run: |
$current = Get-Date -AsUtc
$endDate = $current.AddDays(2)
$end = Get-Date -Date $endDate -UFormat '+%Y-%m-%dT%H:%MZ'
Write-Host "Getting Asset Cache SAS"
$assetSas = az storage container generate-sas --name cache --account-name vcpkgassetcachewus3 --as-user --auth-mode login --https-only --permissions rcl --expiry $end -o tsv | Out-String
if ($LastExitCode -ne 0) {
Write-Error "Failed to get Asset Cache SAS"
return 1
}
$assetSas = $assetSas.Trim()
Write-Host "Getting Binary Cache SAS"
$binarySas = az storage container generate-sas --name cache --account-name vcpkgbinarycachewus --as-user --auth-mode login --https-only --permissions rclw --expiry $end -o tsv | Out-String
if ($LastExitCode -ne 0) {
Write-Error "Failed to get Binary Cache SAS"
return 1
}
$binarySas = $binarySas.Trim()
$env:X_VCPKG_ASSET_SOURCES = "x-azurl,https://vcpkgassetcachewus3.blob.core.windows.net/cache,$assetSas,readwrite"
if ($IsWindows) { # FIXME: Git in the images
$env:PATH += ";c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\cmd"
}
- name: Bootstrap
run: ./bootstrap-vcpkg.sh

- name: Example
& scripts/azure-pipelines/test-modified-ports.ps1 -Triplet ${{ matrix.conf.triplet }} -BuildReason ${{ github.event_name }} -BinarySourceStub "x-azblob,https://vcpkgbinarycachewus.blob.core.windows.net/cache,$binarySas" -WorkingRoot $env:WORKING_ROOT -ArtifactStagingDirectory $env:ARTIFACT_STAGING
- name: "*** Test Modified Ports (Android)"
if: ${{ success() && matrix.conf.pool == 'android' }}
run: |
az acr login --name vcpkgandroidwus
docker pull vcpkgandroidwus.azurecr.io/vcpkg-android:2024-10-21
docker run --rm \
--mount type=bind,source=${{ github.workspace }},target=/vcpkg \
vcpkgandroidwus.azurecr.io/vcpkg-android:2024-10-21 \
./bootstrap-vcpkg.sh
end=`date -u -d "2 days" '+%Y-%m-%dT%H:%MZ'`
assetSas=`az storage container generate-sas --name cache --account-name vcpkgassetcachewus3 --as-user --auth-mode login --https-only --permissions rcl --expiry $end -o tsv`
binarySas=`az storage container generate-sas --name cache --account-name vcpkgbinarycachewus --as-user --auth-mode login --https-only --permissions rclw --expiry $end -o tsv`
echo Minting SAS tokens valid through $end
USER=$(id --user)
docker run --init -i \
-a stderr \
-a stdout \
--user $USER \
--mount type=bind,source=${{ github.workspace }},target=/vcpkg \
--mount type=bind,source=/mnt/vcpkg-ci/failure-logs,target=/vcpkg/failure-logs \
--mount type=bind,source=/mnt/vcpkg-ci,target=/mnt/vcpkg-ci \
--env X_VCPKG_ASSET_SOURCES="x-azurl,https://vcpkgassetcachewus3.blob.core.windows.net/cache,$assetSas,readwrite" \
vcpkgandroidwus.azurecr.io/vcpkg-android:2024-10-21 \
pwsh \
-File /vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 \
-Triplet ${{ matrix.conf.triplet }} \
-BuildReason ${{ github.event_name }} \
-BinarySourceStub "x-azblob,https://vcpkgbinarycachewus.blob.core.windows.net/cache,$binarySas" \
-WorkingRoot /mnt/vcpkg-ci \
-ArtifactStagingDirectory /mnt/vcpkg-ci/artifactstaging
- name: 'Validate version files'
if: ${{ success() && matrix.conf.extra-checks }}
env:
PATH: c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\cmd;$PATH
run: 'scripts/azure-pipelines/windows/validate-version-files.ps1'
- name: 'Publish Artifact: failure logs for ${{ matrix.conf.triplet }}'
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
with:
name: 'failure logs for ${{ matrix.conf.triplet }}'
path: '${{ env.ARTIFACT_STAGING }}/failure-logs'
retention-days: 7
if-no-files-found: ignore
- name: 'Build a file list for all packages'
if: ${{ !cancelled() }}
shell: pwsh
run: Write-Host 'Running on 1ES Hosted GitHub Runners'
run: |
./vcpkg fetch python3
& $(./vcpkg fetch python3) ./scripts/file_script.py "$env:WORKING_ROOT/installed/vcpkg/info/"
- name: 'Publish Artifact: file lists for ${{ matrix.conf.triplet }}'
uses: actions/upload-artifact@v4
if: ${{ !cancelled() }}
with:
name: 'file lists for ${{ matrix.conf.triplet }}'
path: scripts/list_files
retention-days: 7
if-no-files-found: ignore
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
112 changes: 0 additions & 112 deletions scripts/azure-pipelines/android/azure-pipelines.yml

This file was deleted.

Loading

0 comments on commit 746d235

Please sign in to comment.