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

…ucture
actions · Nov 14, 2023 · 0330c5c · 0330c5c
2 parents 6d84fd6 + 5739887
commit 0330c5c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 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/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh
@@ -87,4 +87,4 @@ bazel
 az extension add -n azure-devops
 
 # Invoke tests for all basic tools
-invoke_tests "BasicTools"
+invoke_tests "BasicTools"
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