Skip to content

Commit

Permalink
upstream updates (#10)
Browse files Browse the repository at this point in the history
* [Ubuntu] 22.04: install libssl1.1 via apt (actions#9432)

Signed-off-by: You-Sheng Yang <vicamo@gmail.com>

* [Windows] Upgrade php version to 8.3 (actions#9439)

* [macOS] update webservers pester test (actions#9444)

* Updating readme file for win19 version 20240304.2.1 (actions#9453)

Co-authored-by: Image generation service account <no-reply@microsoft.com>

* Updating readme file for ubuntu22 version 20240304.1.1 (actions#9450)

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 20240304.1.1 (actions#9451)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* [Windows] Update Kotlin installer hash check (actions#9469)

* Updating readme file for win22 version 20240304.2.1 (actions#9449)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* [Ubuntu] Update Kotlin installer hash check (actions#9468)

* [macOS] Remove VCPKG from macOS-14 (actions#9465)

* Add Image Rollout Status badges (actions#9486)

* [macOS]  remove blackhole 2ch (actions#9487)

* [macOS] remove blackhole-2ch

* Update System.Tests.ps1

* [Ubuntu] Update Az to 11.3.1 (actions#9490)

* [windows] Update Az to 11.3.1 (actions#9489)

* [macOS] Add PowerShell version of Configure-Xcode-Simulators script (actions#9496)

* Updating signature for Visual Studio Enterprise 2022.17. (actions#9502)

* [macOS] pin xcbeautify on OS12 (actions#9501)

* Updating readme file for ubuntu20 version 20240310.1.1 (actions#9483)

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 win19 version 20240310.1.1 (actions#9485)

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 20240310.1.1 (actions#9482)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* Fixed typos (actions#9509)

* Fixed some typos.

* Some more typos.

---------

Co-authored-by: Leon Zandman <lzandman@rdw.nl>

* [macOS] add xcode 15.3 to macOS 13, 14 (actions#9505)

* [macOS] Delete more software from Big Sur (actions#9488)

* Updating readme file for win22 version 20240310.1.1 (actions#9481)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* [Ubuntu] Decrease vm.mmap_rnd_bit to prevent ASLR ASAN issues (actions#9513)

* Add Xamarin bundle (actions#9514)

* Unpin SYFT tool version for Windows images (actions#9522)

* Unpin SYFT tool version for Windows images

* Update upload-artifact action version to v4

* [MacOS] Add install-python.sh to arm64 templates (actions#9474)

* add install-python.sh to arm64 templates

* add Pipx pester test

* Update Python.Tests.ps1

* bump python version

* Updating readme file for ubuntu22 version 20240317.1.1 (actions#9532)

Co-authored-by: Image generation service account <no-reply@microsoft.com>

* Updating readme file for win19 version 20240317.1.1 (actions#9527)

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 20240317.1.1 (actions#9528)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* Update README.md to inccude macOS-latest-xlarge (actions#9541)

* Updating readme file for ubuntu20 version 20240317.1.1 (actions#9531)

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-13 version 20240219.1 (actions#9375)

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-13-arm64 version 20240219.3 (actions#9374)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* [DOCS] remove obsolete debug guide (actions#9548)

* Updating readme file for macos-14-arm64 version 20240219.1 (actions#9380)

Co-authored-by: Image generation service account <no-reply@microsoft.com>

* [Ubuntu] remove Docker Comose v1 (actions#9559)

* [Windows] remove Docker Comose v1 (actions#9558)

* [macos13] Remove Xcode 15.3 (actions#9575)

* [Windows] pin zstd to v1.5.5 (actions#9570)

* Updating readme file for win19 version 20240322.1.1 (actions#9556)

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 20240324.1.1 (actions#9561)

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 20240324.2.1 (actions#9560)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* [macos] Fix composer version parser (actions#9585)

* [macOS] Force curl to use IPv4 (actions#9586)

* Updating readme file for macos-13 version 20240327.2 (actions#9580)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* [Windows] Add WIX binaries folder to the PATH (actions#9582)

* [Windows] Add WIX binaries folder to the PATH

* Add Update-Environment, small prettifying

* Move tests from script to Pester

* Fix Wix tests to use Join-Path

---------

Co-authored-by: Leon Zandman <lzandman@github.com>

* Updating readme file for win22 version 20240322.1.1 (actions#9555)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* Revert "[Windows] pin zstd to v1.5.5 (actions#9570)" (actions#9589)

This reverts commit f6950e8.

* Updating readme file for macos-14 version 20240325.1 (actions#9578)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* [ubuntu] Fix arch in Install-Toolset.ps1 (actions#9598)

* Updating readme file for macos-14-arm64 version 20240325.1 (actions#9579)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* [Windows] Fix outdated Azure CLI installer signature (actions#9611)

* Update README.md (actions#9601)

macOS 14 GA changes

* [Windows] Force Resolve-ChocoPackageVersion function to use CLI (actions#9605)

* Revert "[Ubuntu] remove Docker Comose v1 (actions#9559)" (actions#9617)

* [Windows] Update docker-compose installation method (actions#9618)

* Updating readme file for macOS-12 version 20240329.1 (actions#9599)

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-14 version 20240402.2 (actions#9622)

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-14-arm64 version 20240402.2 (actions#9620)

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-13 version 20240402.2 (actions#9619)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* Revert "[macOS] Force curl to use IPv4 (actions#9586)" (actions#9631)

* Updating readme file for macos-13-arm64 version 20240402.2 (actions#9621)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* Update README.md (OS14 latest migration) (actions#9642)

* [MacOS] Fix pipx vars for arm64 (actions#9609)

* fix pipx vars for arm64

* fix white space in path

* Updating readme file for win19 version 20240403.1.1 (actions#9636)

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 20240403.1.1 (actions#9637)

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 20240407.1.1 (actions#9657)

Co-authored-by: Image generation service account <no-reply@microsoft.com>

* Updating readme file for ubuntu22 version 20240407.1.1 (actions#9656)

Co-authored-by: Image generation service account <no-reply@microsoft.com>

* Configurable SSH port (actions#9660)

* [Windows] Update Visual Studio 2022 signature (actions#9668)

* Updating readme file for win19 version 20240407.1.1 (actions#9655)

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-14 version 20240405.1 (actions#9652)

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-13 version 20240405.2 (actions#9651)

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 20240407.1.1 (actions#9648)

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-14-arm64 version 20240405.1 (actions#9653)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

* fix swift

* [Ubuntu] Fix Swift installer (actions#9677)

* Updating readme file for macos-13-arm64 version 20240405.1 (actions#9650)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>

---------

Signed-off-by: You-Sheng Yang <vicamo@gmail.com>
Co-authored-by: You-Sheng Yang <vicamo@gmail.com>
Co-authored-by: Shivam Mathur <shivam_jpr@hotmail.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: Erik Bershel <110455084+erik-bershel@users.noreply.github.com>
Co-authored-by: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com>
Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Co-authored-by: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com>
Co-authored-by: Piotr Grabski-Gradziński <piotr.gradzinski@gmail.com>
Co-authored-by: Leon Zandman <leon@wirwar.com>
Co-authored-by: Leon Zandman <lzandman@rdw.nl>
Co-authored-by: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com>
Co-authored-by: Leon Zandman <lzandman@github.com>
Co-authored-by: Steve-Glass <84886334+Steve-Glass@users.noreply.github.com>
Co-authored-by: Pavel Iakovenko <paveliak@users.noreply.github.com>
  • Loading branch information
18 people committed Apr 12, 2024
1 parent 5c9bf52 commit 659d053
Show file tree
Hide file tree
Showing 74 changed files with 1,093 additions and 961 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/create_sbom_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
}
- name: Install SYFT tool on Windows
if: ${{ runner.os == 'Windows' }}
run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft v0.100.0
run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft
- name: Install SYFT tool on Ubuntu or macOS
if: ${{ runner.os != 'Windows' }}
run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin v0.100.0
Expand All @@ -74,7 +74,7 @@ jobs:
- name: Compress SBOM file
run: Compress-Archive sbom.json sbom.json.zip
#Upload artifact action
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: sbom-${{ github.event.client_payload.agentSpec }}-${{ github.event.client_payload.imageVersion }}
path: sbom.json.zip
Expand Down
28 changes: 16 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat

## Available Images

| Image | YAML Label | Included Software |
| --------------------|---------------------|--------------------|
| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] |
| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] |
| macOS 14 [beta] | `macos-14-large`| [macOS-14] |
| macOS 14 Arm64 [beta] | `macos-14` or `macos-14-xlarge`| [macOS-14-arm64] |
| macOS 13 | `macos-13`, `macos-13-large` or `macos-latest-large` | [macOS-13] |
| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] |
| macOS 12 | `macos-latest`,`macos-12` or`macos-12-large`| [macOS-12] |
| macOS 11 [deprecated] | `macos-11`| [macOS-11] |
| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] |
| Windows Server 2019 | `windows-2019` | [windows-2019] |
| Image | YAML Label | Included Software | Rollout Status of Latest Image Release |
| --------------------|---------------------|--------------------|--------------------|
| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu22.json) |
| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu20.json) |
| macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14.json) |
| macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14-arm64.json) |
| macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13.json) |
| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13-arm64.json) |
| macOS 12 | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-12.json) |
| macOS 11 [deprecated] | `macos-11`| [macOS-11] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-11.json) |
| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin22.json) |
| Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin19.json) |

### Label scheme

Expand Down Expand Up @@ -91,6 +91,10 @@ GitHub Actions and Azure DevOps use the `-latest` YAML label (ex: `ubuntu-latest

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).

#### Planned & ongoing migration(s)

We are currently in the process of `macos-14` to `macos-latest` migration, details can be found [here](https://github.blog/changelog/2024-04-01-macos-14-sonoma-is-generally-available-and-the-latest-macos-runner-image).


## Image Releases

Expand Down
26 changes: 0 additions & 26 deletions docs/debugging-failed-builds.md

This file was deleted.

Binary file removed docs/resources/askOnError.png
Binary file not shown.
Binary file removed docs/resources/packerResourceGroup.png
Binary file not shown.
Binary file removed docs/resources/resourceGroupName.png
Binary file not shown.
Binary file removed docs/resources/vmCredentials.png
Binary file not shown.
10 changes: 5 additions & 5 deletions helpers/software-report-base/SoftwareReport.BaseNodes.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ class BaseNode {
}

[String] ToMarkdown([Int32] $Level) {
throw "Abtract method 'ToMarkdown(level)' is not implemented for '$($this.GetType().Name)'"
throw "Abstract method 'ToMarkdown(level)' is not implemented for '$($this.GetType().Name)'"
}

[Boolean] IsSimilarTo([BaseNode] $OtherNode) {
throw "Abtract method 'IsSimilarTo' is not implemented for '$($this.GetType().Name)'"
throw "Abstract method 'IsSimilarTo' is not implemented for '$($this.GetType().Name)'"
}

[Boolean] IsIdenticalTo([BaseNode] $OtherNode) {
throw "Abtract method 'IsIdenticalTo' is not implemented for '$($this.GetType().Name)'"
throw "Abstract method 'IsIdenticalTo' is not implemented for '$($this.GetType().Name)'"
}
}

Expand All @@ -39,7 +39,7 @@ class BaseToolNode: BaseNode {
}

[String] GetValue() {
throw "Abtract method 'GetValue' is not implemented for '$($this.GetType().Name)'"
throw "Abstract method 'GetValue' is not implemented for '$($this.GetType().Name)'"
}

[Boolean] IsSimilarTo([BaseNode] $OtherNode) {
Expand All @@ -53,4 +53,4 @@ class BaseToolNode: BaseNode {
[Boolean] IsIdenticalTo([BaseNode] $OtherNode) {
return $this.IsSimilarTo($OtherNode) -and ($this.GetValue() -eq $OtherNode.GetValue())
}
}
}
2 changes: 1 addition & 1 deletion images.CI/macos/anka/Anka.Helpers.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function Push-AnkaTemplateToRegistry {
[string] $TemplateName
)

# if registry uuid doesn't match than delete an image in registry
# if registry uuid doesn't match then delete an image in registry
$AnkaCaCrtPath="$HOME/.config/anka/certs/anka-ca-crt.pem"
$images = anka --machine-readable registry --cacert $AnkaCaCrtPath --registry-path $RegistryUrl list | ConvertFrom-Json | ForEach-Object body
$images | Where-Object name -eq $TemplateName | ForEach-Object {
Expand Down
2 changes: 1 addition & 1 deletion images.CI/macos/anka/CreateCleanAnkaTemplate.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function Invoke-SoftwareUpdate {
$ipAddress = Get-AnkaVMIPAddress -VMName $TemplateName

# Unenroll Seed
Write-Host "`t[*] Reseting the seed before requesting stable versions"
Write-Host "`t[*] Resetting the seed before requesting stable versions"
Remove-CurrentBetaSeed -HostName $ipAddress | Show-StringWithFormat

# Install Software Updates
Expand Down
4 changes: 2 additions & 2 deletions images.CI/macos/anka/Service.Helpers.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ function Get-MacOSInstaller {
Write-Host "`t[*] Beta Version requested. Enrolling machine to DeveloperSeed"
sudo $seedutil enroll DeveloperSeed | Out-Null
} else {
Write-Host "`t[*] Reseting the seed before requesting stable versions"
Write-Host "`t[*] Resetting the seed before requesting stable versions"
sudo $seedutil unenroll | Out-Null
}

# Validate there is no softwareupdate at the moment
# Validate there is no software update at the moment
Test-SoftwareUpdate

# Validate availability OSVersion
Expand Down
Loading

0 comments on commit 659d053

Please sign in to comment.