Merge pull request #573 from SteveL-MSFT/update-crates

Update crates and remove dependency on node for building
PowerShell · Oct 15, 2024 · ed7d8a7 · ed7d8a7
2 parents 28c626b + 8796398
commit ed7d8a7
Show file tree

Hide file tree

Showing 35 changed files with 49,990 additions and 3,853 deletions.
diff --git a/.pipelines/DSC-Official.yml b/.pipelines/DSC-Official.yml
@@ -19,8 +19,8 @@ variables:
   BuildConfiguration: 'release'
   PackageRoot: '$(System.ArtifactsDirectory)/Packages'
 #  LinuxContainerImage: 'mcr.microsoft.com/onebranch/cbl-mariner/build:2.0'
-  LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
   WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
+  Codeql.TSAEnabled: true
 
 resources:
   repositories:
@@ -228,6 +228,7 @@ extends:
       - job: BuildLinux
         dependsOn: SetPackageVersion
         variables:
+          LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
           PackageVersion: $[ dependencies.SetPackageVersion.outputs['Package.Version'] ]
           ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
         displayName: Linux-x64-gnu
@@ -252,11 +253,13 @@ extends:
       - job: BuildLinuxArm64
         dependsOn: SetPackageVersion
         variables:
+          LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest'
           PackageVersion: $[ dependencies.SetPackageVersion.outputs['Package.Version'] ]
           ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
         displayName: Linux-ARM64-gnu
         pool:
           type: linux
+          hostArchitecture: arm64
         steps:
         - task: RustInstaller@1
           inputs:
@@ -269,6 +272,9 @@ extends:
         - pwsh: |
             apt update
             apt -y install gcc-aarch64-linux-gnu
+            if ((openssl version -d) -match 'OPENSSLDIR: "(?<dir>.*?)"') {
+              $env:OPENSSL_LIB_DIR = $matches['dir']
+            }
             ./build.ps1 -Release -Architecture aarch64-unknown-linux-gnu
             ./build.ps1 -PackageType tgz -Architecture aarch64-unknown-linux-gnu -Release
             Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
@@ -278,6 +284,7 @@ extends:
       - job: BuildLinuxMusl
         dependsOn: SetPackageVersion
         variables:
+          LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
           PackageVersion: $[ dependencies.SetPackageVersion.outputs['Package.Version'] ]
           ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
         displayName: Linux-x64-musl
@@ -304,11 +311,13 @@ extends:
       - job: BuildLinuxArm64Musl
         dependsOn: SetPackageVersion
         variables:
+          LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest'
           PackageVersion: $[ dependencies.SetPackageVersion.outputs['Package.Version'] ]
           ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
         displayName: Linux-ARM64-musl
         pool:
           type: linux
+          hostArchitecture: arm64
         steps:
         - task: RustInstaller@1
           inputs:
@@ -327,7 +336,12 @@ extends:
             apt -y install llvm
             apt -y install musl-tools
             apt -y install gcc-multilib
+            apt -y install libssl-dev
+            apt -y install pkg-config
             rustup default stable-aarch64-unknown-linux-musl
+            if ((openssl version -d) -match 'OPENSSLDIR: "(?<dir>.*?)"') {
+              $env:OPENSSL_LIB_DIR = $matches['dir']
+            }
             ./build.ps1 -Release -Architecture aarch64-unknown-linux-musl
             ./build.ps1 -PackageType tgz -Architecture aarch64-unknown-linux-musl -Release
             Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"

diff --git a/NOTICE.txt b/NOTICE.txt
diff --git a/build.ps1 b/build.ps1
@@ -14,7 +14,8 @@ param(
     [switch]$SkipLinkCheck,
     [switch]$UseX64MakeAppx,
     [switch]$UseCratesIO,
-    [switch]$UpdateLockFile
+    [switch]$UpdateLockFile,
+    [switch]$Audit
 )
 
 if ($GetPackageVersion) {
@@ -32,6 +33,7 @@ $filesForWindowsPackage = @(
     'echo.dsc.resource.json',
     'assertion.dsc.resource.json',
     'group.dsc.resource.json',
+    'NOTICE.txt',
     'powershell.dsc.resource.json',
     'psDscAdapter/',
     'reboot_pending.dsc.resource.json',
@@ -53,6 +55,7 @@ $filesForLinuxPackage = @(
     'apt.dsc.resource.json',
     'apt.dsc.resource.sh',
     'group.dsc.resource.json',
+    'NOTICE.txt',
     'powershell.dsc.resource.json',
     'psDscAdapter/',
     'RunCommandOnSet.dsc.resource.json',
@@ -67,6 +70,7 @@ $filesForMacPackage = @(
     'brew.dsc.resource.json',
     'brew.dsc.resource.sh',
     'group.dsc.resource.json',
+    'NOTICE.txt',
     'powershell.dsc.resource.json',
     'psDscAdapter/',
     'RunCommandOnSet.dsc.resource.json',
@@ -222,7 +226,8 @@ if (!$SkipBuild) {
         "runcommandonset",
         "tools/dsctest",
         "tools/test_group_resource",
-        "y2j"
+        "y2j",
+        "."
     )
     $pedantic_unclean_projects = @()
     $clippy_unclean_projects = @("tree-sitter-dscexpression")
@@ -252,6 +257,14 @@ if (!$SkipBuild) {
                     cargo generate-lockfile
                 }
                 else {
+                    if ($Audit) {
+                        if ($null -eq (Get-Command cargo-audit -ErrorAction Ignore)) {
+                            cargo install cargo-audit --features=fix
+                        }
+
+                        cargo audit fix
+                    }
+
                     ./build.ps1
                 }
             }
@@ -276,6 +289,14 @@ if (!$SkipBuild) {
                         cargo generate-lockfile
                     }
                     else {
+                        if ($Audit) {
+                            if ($null -eq (Get-Command cargo-audit -ErrorAction Ignore)) {
+                                cargo install cargo-audit --features=fix
+                            }
+
+                            cargo audit fix
+                        }
+
                         cargo build @flags
                     }
                 }

diff --git a/copy_files.txt b/copy_files.txt
@@ -0,0 +1 @@
+NOTICE.txt