Repo sync 0623 (#1)

* Fix url for the Ubuntu 20 libcontainers repo key (actions#7629) * [Ubuntu] dearmor gpg key for google-cloud-sdk (actions#7627) * Correct typo from 'Delimeter' to 'Delimiter' (actions#7625) * [macOS] Add XCode 14.3.1 for macOS 13 (actions#7631) * [macOS] Update condition for automation mode (actions#7626) * README: explain -latest migration process (actions#7634) * Update azure function name (actions#7636) * [Ubuntu] Add archive.ubuntu.com to sources.list (actions#7616) * [Ubuntu] Update libssl package version (actions#7655) * [Windows] fix choco installation (actions#7657) * [Windows] fix software report for innosetup (actions#7658) * Updating readme file for ubuntu20 version 20230517.1 (actions#7644) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for ubuntu22 version 20230517.1 (actions#7645) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for win22 version 20230517.1 (actions#7647) Co-authored-by: Image generation service account <no-reply@microsoft.com> * Updating readme file for win19 version 20230517.1 (actions#7646) Co-authored-by: Image generation service account <no-reply@microsoft.com> * [macos] add cookie based installation for Xcode (actions#7666) * Updating readme file for macOS-11 version 20230516.1 (actions#7642) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for macOS-12 version 20230516.1 (actions#7641) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * set $IsLatest to false when specifying exact version (actions#7677) * Updating readme file for macos-13 version 20230524.1 (actions#7652) Co-authored-by: Image generation service account <no-reply@microsoft.com> * [windows] warmup VisualStudio for vdproj (actions#7649) it takes up to several minutes to run devenv for the first time on vdproj. * Updating readme file for ubuntu20 version 20230604.1 (actions#7673) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * [macos] Adjust hcl2 packer templates with decoding (actions#7685) * Updating readme file for ubuntu22 version 20230604.1 (actions#7674) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Fix typo (actions#7689) * [macos] add XCode 15 to MacOS 13 images (actions#7693) * Update Visual Studio VC Component versions (actions#7694) * Updating readme file for win19 version 20230606.1 (actions#7680) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for win22 version 20230606.1 (actions#7679) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Set checkout options in inage generation pipeline (actions#7708) * Update conditions for CI jobs (actions#7714) * [Ubuntu] update curl command to work with https (actions#7723) * [macOS] CodeQL: Simplify the toolcache version number for bundles tagged using semver (actions#7717) * [Windows] CodeQL: Simplify the toolcache version number for bundles tagged using semver (actions#7718) * [Linux] CodeQL: Simplify the toolcache version number for bundles tagged using semver (actions#7716) * Updating readme file for win19 version 20230612.1 (actions#7711) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for win22 version 20230612.1 (actions#7712) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for ubuntu22 version 20230611.1 (actions#7701) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Updating readme file for ubuntu20 version 20230611.1 (actions#7702) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> * Update GenerateResourcesAndImage related documentation (actions#7738) * Cache Android SDK packages list (actions#7709) * Revert "[Windows] download MySQL from SA (actions#6769)" (actions#7732) --------- Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Co-authored-by: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Co-authored-by: Jongwoo Han <jongwooo.han@gmail.com> Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> Co-authored-by: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Co-authored-by: Sam Fox <samfoxcode@github.com> Co-authored-by: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Co-authored-by: Grant Hutchins <github@nertzy.com> Co-authored-by: Henry Mercer <henrymercer@github.com>
runnerImages · Jun 19, 2023 · 8ea2963 · 8ea2963
1 parent e1366c9
commit 8ea2963
Show file tree

Hide file tree

Showing 53 changed files with 1,765 additions and 826 deletions.
diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml
@@ -40,6 +40,7 @@ body:
         - label: Ubuntu 22.04
         - label: macOS 11
         - label: macOS 12
+        - label: macOS 13
         - label: Windows Server 2019
         - label: Windows Server 2022
   - type: textarea

diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml
@@ -61,6 +61,7 @@ body:
         - label: Ubuntu 22.04
         - label: macOS 11
         - label: macOS 12
+        - label: macOS 13
         - label: Windows Server 2019
         - label: Windows Server 2022
   - type: textarea

diff --git a/.github/workflows/macos-generation.yml b/.github/workflows/macos-generation.yml
@@ -105,6 +105,13 @@ jobs:
           -VIPassword ${{ secrets.VI_PASSWORD }} `
           -Cluster ${{ env.ESXI_CLUSTER }}
 
+    - name: Create xcversion session cookie file
+      shell: bash
+      run: |
+        mkdir -p ${{ runner.temp }}/xcversion-cookie
+        cookie='${{ secrets.XCVERSION_AUTH_COOKIE }}'
+        echo "$cookie" > ${{ runner.temp }}/xcversion-cookie/cookie
+
     - name: Build VM
       run: |
         $SensitiveData = @(
@@ -126,6 +133,7 @@ jobs:
         -var="baseimage_name=${{ inputs.base_image_name }}" `
         -var="xcode_install_user=${{ secrets.XCODE_USER }}" `
         -var="xcode_install_password=${{ secrets.XCODE_PASSWORD }}" `
+        -var="xcversion_auth_cookie=${{ env.XCVERSION_COOKIE_PATH }}" `
         -color=false `
         ${{ inputs.template_path }} `
         | Where-Object {
@@ -138,6 +146,7 @@ jobs:
       env:
         PACKER_LOG: 1
         PACKER_LOG_PATH: ${{ runner.temp }}/packer-log.txt
+        XCVERSION_COOKIE_PATH: ${{ runner.temp }}/xcversion-cookie/cookie
 
     - name: Prepare artifact
       shell: bash

diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml
@@ -17,7 +17,7 @@ on:
 
 jobs:
   macOS_11:
-    if: ${{ (github.event.label.name == 'CI macos-all') || (github.event.label.name == 'CI macos-11') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }}
+    if: contains(github.event.pull_request.labels.*.name, 'CI macos-all') || contains(github.event.pull_request.labels.*.name, 'CI macos-11') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule')
     name: macOS-11_unstable.${{ github.run_id }}.${{ github.run_attempt }}
     uses: ./.github/workflows/macos-generation.yml
     with:

diff --git a/.github/workflows/macos12.yml b/.github/workflows/macos12.yml
@@ -17,7 +17,7 @@ on:
 
 jobs:
   macOS_12:
-    if: ${{ (github.event.label.name == 'CI macos-all') || (github.event.label.name == 'CI macos-12') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }}
+    if: contains(github.event.pull_request.labels.*.name, 'CI macos-all') || contains(github.event.pull_request.labels.*.name, 'CI macos-12') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule')
     name: macOS-12_unstable.${{ github.run_id }}.${{ github.run_attempt }}
     uses: ./.github/workflows/macos-generation.yml
     with:

diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml
@@ -17,7 +17,7 @@ on:
 
 jobs:
   Ubuntu_2004:
-    if: ${{ (github.event.label.name == 'CI ubuntu-all') || (github.event.label.name == 'CI ubuntu-2004') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }}
+    if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2004') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule')
     uses: ./.github/workflows/ubuntu-win-generation.yml
     with:
       image_name: 'ubuntu2004'

diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml
@@ -17,7 +17,7 @@ on:
 
 jobs:
   Ubuntu_2204:
-    if: ${{ (github.event.label.name == 'CI ubuntu-all') || (github.event.label.name == 'CI ubuntu-2204') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }}
+    if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2204') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule')
     uses: ./.github/workflows/ubuntu-win-generation.yml
     with:
       image_name: 'ubuntu2204'

diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml
@@ -17,7 +17,7 @@ on:
 
 jobs:
   Windows_2019:
-    if: ${{ (github.event.label.name == 'CI windows-all') || (github.event.label.name == 'CI windows-2019') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }}
+    if: contains(github.event.pull_request.labels.*.name, 'CI windows-all') || contains(github.event.pull_request.labels.*.name, 'CI windows-2019') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule')
     uses: ./.github/workflows/ubuntu-win-generation.yml
     with:
       image_name: 'windows2019'

diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml
@@ -17,7 +17,7 @@ on:
 
 jobs:
   Windows_2022:
-    if: ${{ (github.event.label.name == 'CI windows-all') || (github.event.label.name == 'CI windows-2022') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }}
+    if: contains(github.event.pull_request.labels.*.name, 'CI windows-all') || contains(github.event.pull_request.labels.*.name, 'CI windows-2022') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule')
     uses: ./.github/workflows/ubuntu-win-generation.yml
     with:
       image_name: 'windows2022'

diff --git a/README.md b/README.md
@@ -21,13 +21,13 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat
 
 | Image | YAML Label | Included Software | Rollout Progress of Latest Image Release |
 | --------------------|---------------------|--------------------|---------------------|
-| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1)
-| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1)
-| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md) | TBD
-| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | [![statusumac12](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1)
-| macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1)
-| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) |
-| Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1)
+| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1)
+| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1)
+| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13] | [![statusumac13](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&redirect=1)
+| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | [![statusumac12](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1)
+| macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1)
+| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) |
+| Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1)
 
 ### Label scheme
 
@@ -40,6 +40,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat
 [windows-2019]: https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md
 [macOS-11]: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md
 [macOS-12]: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
+[macOS-13]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
 [macOS-10.15]: https://github.com/actions/runner-images/blob/main/images/macos/macos-10.15-Readme.md
 [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners
 
@@ -68,6 +69,14 @@ version for the underlying OS and
 This image type falls under the customer [SLA](https://github.com/customer-terms/github-online-services-sla) for actions. GA images are eventually deprecated according to our guidelines as we only support the
 latest 2 versions of an OS.
 
+#### Latest Migration Process
+
+GitHub Actions and Azure DevOps use the `-latest` YAML label (ex: `ubuntu-latest`, `windows-latest`, and `macos-latest`). These labels point towards the newest stable OS version available.
+
+
+The `-latest` migration process is gradual and happens over 1-2 months in order to allow customers to adapt their workflows to the newest OS version. During this process, any workflow using the `-latest` label, may see changes in the OS version in their workflows or pipelines. To avoid unwanted migration, users can specify a specific OS version in the yaml file (ex: macos-12, windows-2022, ubuntu-22.04).
+
+
 ## Image Releases
 
 *How to best follow along with changes*

diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md
@@ -85,18 +85,18 @@ Then import [GenerateResourcesAndImage](../helpers/GenerateResourcesAndImage.ps1
 Import-Module .\helpers\GenerateResourcesAndImage.ps1
 ```
 
+> :warning: When running `GenerateResourcesAndImage` in PowerShell 7.3, following command should be executed first:
+> ```powershell
+> $PSNativeCommandArgumentPassing = 'Legacy'
+> ```
+
 Finally, run `GenerateResourcesAndImage` function setting mandatory arguments: image type and where to create resources:
 
 - `SubscriptionId` - your Azure Subscription ID
 - `ResourceGroupName` - name of the resource group that will be created within your subscription (e.g. "imagegen-test")
 - `AzureLocation` - location where resources will be created (e.g. "East US")
 - `ImageType` - what image to build (we suggest choosing "UbuntuMinimal" here, other valid options are "Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204")
 
-> :warning: When running `GenerateResourcesAndImage` in PowerShell 7.3, following command should be executed first:
-> ```powershell
-> $PSNativeCommandArgumentPassing = 'Legacy'
-> ```
-
 This function automatically creates all required Azure resources and kicks off packer image generation for the selected image type.
 
 When image is ready you may proceed to [deployment](#generated-machine-deployment)

diff --git a/helpers/software-report-base/SoftwareReport.Nodes.psm1 b/helpers/software-report-base/SoftwareReport.Nodes.psm1
@@ -279,10 +279,10 @@ class TableNode: BaseNode {
         $maxColumnWidths = $this.CalculateColumnsWidth()
         $columnsCount = $maxColumnWidths.Count
 
-        $delimeterLine = [String]::Join("|", @("-") * $columnsCount)
+        $delimiterLine = [String]::Join("|", @("-") * $columnsCount)
 
         $sb = [System.Text.StringBuilder]::new()
-        @($this.Headers) + @($delimeterLine) + $this.Rows | ForEach-Object {
+        @($this.Headers) + @($delimiterLine) + $this.Rows | ForEach-Object {
             $sb.Append("|")
             $row = $_.Split("|")
 

diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml
@@ -43,6 +43,9 @@ jobs:
 
   steps:
   - checkout: ${{ parameters.repository_ref }}
+    clean: true
+    fetchDepth: 0
+    fetchTags: false
 
   - task: PowerShell@2
     displayName: 'Download custom repository'

diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1
@@ -109,7 +109,7 @@ function Get-MacOSIPSWInstaller {
         $targetVersion = Get-AvailableIPSWVersions -IsBeta $true -MacOSCodeNameOrVersion $MacOSName
         Write-host "`t[*] The 'BetaSearch' flag is set to true. Latestbeta macOS version is '$MacOSName' - '$targetVersion' now"
     } else {
-        $targetVersion = Get-AvailableIPSWVersions -MacOSCodeNameOrVersion $MacOSName
+        $targetVersion = Get-AvailableIPSWVersions -MacOSCodeNameOrVersion $MacOSName -IsLatest $false
         Write-host "`t[*] The exact version was specified - '$MacOSName' "
     }
 

diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml
@@ -58,6 +58,12 @@ jobs:
                  -VIPassword '$(vcenter-password-v2)' `
                  -Cluster "$(esxi-cluster-v2)"
 
+  - task: DownloadSecureFile@1
+    name: xcVersionCookie
+    displayName: 'Download xcversion session cookie'
+    inputs:
+      secureFile: 'cookie'
+
   - pwsh: |
       $SensitiveData = @(
           'IP address:',
@@ -79,6 +85,7 @@ jobs:
         -var="baseimage_name=${{ parameters.base_image_name }}" `
         -var="xcode_install_user=$(xcode-installation-user)" `
         -var="xcode_install_password=$(xcode-installation-password)" `
+        -var="xcversion_auth_cookie=$(xcVersionCookie.secureFilePath)" `
         -color=false `
         ${{ parameters.template_path }} `
         | Where-Object {