Merge branch 'ubuntu-new-folder-structure' into ubuntu-new-folder-str…

…ucture
actions · Nov 8, 2023 · 1fc29cc · 1fc29cc
2 parents b14e8e8 + 48a3da7
commit 1fc29cc
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 19 deletions.
diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml
@@ -3,15 +3,15 @@ schedules:
   displayName: Daily
   branches:
     include:
-    - main
+    - ubuntu-new-folder-structure
   always: true
 
 trigger: none
 pr:
   autoCancel: true
   branches:
     include:
-    - main
+    - ubuntu-new-folder-structure
 
 jobs:
 - template: image-generation.yml

diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md
@@ -248,4 +248,4 @@
 | ANDROID_NDK_HOME        | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 |
 | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 |
 | ANDROID_NDK_ROOT        | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 |
-| ANDROID_SDK_ROOT        | /Users/runner/Library/Android/sdk                   |
+| ANDROID_SDK_ROOT        | /Users/runner/Library/Android/sdk                   |
diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh
@@ -89,4 +89,4 @@ bazel
 az extension add -n azure-devops
 
 # Invoke tests for all basic tools
-invoke_tests "BasicTools"
+invoke_tests "BasicTools"
diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1
@@ -123,12 +123,6 @@ Describe "Go" -Skip:($os.IsVentura -or $os.IsVenturaArm64) {
     }
 }
 
-Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) {
-    It "Check kext kernel modules" {
-        kextstat | Out-String | Should -Match "org.virtualbox.kext"
-    }
-}
-
 Describe "CodeQL Bundle" {
     It "Is installed" {
         $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*"

diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md
@@ -401,4 +401,4 @@ Use the following command as a part of your job to start the service: 'sudo syst
 | xvfb                   | 2:1.20.13-1ubuntu1\~20.04.9       |
 | xz-utils               | 5.2.4-1ubuntu1.1                  |
 | zip                    | 3.0-11build1                      |
-| zsync                  | 0.6.2-3ubuntu1                    |
+| zsync                  | 0.6.2-3ubuntu1                    |
diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md
@@ -385,4 +385,4 @@ Use the following command as a part of your job to start the service: 'sudo syst
 | xvfb                   | 2:21.1.4-2ubuntu1.7\~22.04.2        |
 | xz-utils               | 5.2.5-2ubuntu1                      |
 | zip                    | 3.0-12build2                        |
-| zsync                  | 0.6.2-3ubuntu1                      |
+| zsync                  | 0.6.2-3ubuntu1                      |
diff --git a/images/ubuntu/scripts/build/git.sh b/images/ubuntu/scripts/build/git.sh
@@ -33,4 +33,4 @@ echo "git-core $GIT_REPO" >> $HELPER_SCRIPTS/apt-sources.txt
 ssh-keyscan -t rsa,ecdsa,ed25519 github.com >> /etc/ssh/ssh_known_hosts
 ssh-keyscan -t rsa ssh.dev.azure.com >> /etc/ssh/ssh_known_hosts
 
-invoke_tests "Tools" "Git"
+invoke_tests "Tools" "Git"
diff --git a/images/ubuntu/scripts/build/rust.sh b/images/ubuntu/scripts/build/rust.sh
@@ -31,4 +31,4 @@ rm -rf ${CARGO_HOME}/registry/*
 # Update /etc/environemnt
 prependEtcEnvironmentPath '$HOME/.cargo/bin'
 
-invoke_tests "Tools" "Rust"
+invoke_tests "Tools" "Rust"
diff --git a/images/ubuntu/scripts/tests/Android.Tests.ps1 b/images/ubuntu/scripts/tests/Android.Tests.ps1
@@ -64,4 +64,4 @@ Describe "Android" {
             Validate-AndroidPackage $PackageName
         }
     }
-}
+}
diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1
@@ -414,4 +414,4 @@ Describe "Kotlin" {
     It "kotlin-dce-js" {
         "kotlin-dce-js -version"| Should -ReturnZeroExitCode
     }
-}
+}
diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md
@@ -558,4 +558,4 @@ All other versions are saved but not installed.
 | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:2173a3e2b0c4d9f77bb32846c36c0e9fe27813fe2f19ad868fb5f891486bbc7e  | 2023-10-10 |
 | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019     | sha256:9d2262cd7ac6f4dd4964086e353ba9253be48b5709f850564f877b8dea9614ec  | 2023-10-10 |
 | mcr.microsoft.com/windows/nanoserver:1809                                 | sha256:bed3cb2d55f44371fdeebdabf97e8679347748c16dec0d2c351e25fb0b7bbb32  | 2023-10-02 |
-| mcr.microsoft.com/windows/servercore:ltsc2019                             | sha256:b3b5f1d43d7004541aae6f0c2ead0c70d943c85653f0e37861c73eaa9d687c42  | 2023-10-02 |
+| mcr.microsoft.com/windows/servercore:ltsc2019                             | sha256:b3b5f1d43d7004541aae6f0c2ead0c70d943c85653f0e37861c73eaa9d687c42  | 2023-10-02 |
diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md
@@ -598,4 +598,4 @@ All other versions are saved but not installed.
 | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:8786c438d878b03be3abd125665d51ff9bb9c6429ea0802978f07b60dd910745  | 2023-10-10 |
 | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022     | sha256:180b44ab71dfd238ab4428baf047fee08663de4c317de0bce0887f12e4c7734c  | 2023-10-10 |
 | mcr.microsoft.com/windows/nanoserver:ltsc2022                             | sha256:0e6791612f9448aa2e6713d95ffabdefa26122b58a0b341aace6b5a2d65aee8c  | 2023-10-06 |
-| mcr.microsoft.com/windows/servercore:ltsc2022                             | sha256:40525c24f8e0a1cd4feca7330cf0bcdf125c0f7f2158852f4701dbe7ded2dd7f  | 2023-10-06 |
+| mcr.microsoft.com/windows/servercore:ltsc2022                             | sha256:40525c24f8e0a1cd4feca7330cf0bcdf125c0f7f2158852f4701dbe7ded2dd7f  | 2023-10-06 |
diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1
@@ -35,7 +35,8 @@ rustup target add x86_64-pc-windows-gnu
 
 # Install common tools
 rustup component add rustfmt clippy
-cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated
+cargo install --locked bindgen-cli --version 0.68.1 # Temp fix for https://github.com/rust-lang/rust-bindgen/issues/2677
+cargo install --locked cbindgen cargo-audit cargo-outdated
 
 # Cleanup Cargo crates cache
 Remove-Item "${env:CARGO_HOME}\registry\*" -Recurse -Force
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,4 +64,4 @@ Describe "Android" { @@
                 Validate-AndroidPackage $PackageName
             }
         }
-    }
+    }