Re-enable Windows ARM32 packages build. (#1519)

The new private Rust compiler no longer fails at linking statics. This also means we don't need to use our fork of dtoa that replaced statics with consts. This reverts 947f2ab
Azure · Aug 6, 2019 · 0ce39ee · 0ce39ee
1 parent 2c0155e
commit 0ce39ee
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 54 deletions.
diff --git a/builds/misc/packages.yaml b/builds/misc/packages.yaml
@@ -196,56 +196,56 @@ jobs:
           PathtoPublish: '$(build.artifactstagingdirectory)'
           ArtifactName: 'iotedged-windows'
 
-# ################################################################################
-#   - job: windows_arm32
-# ################################################################################
-#     displayName: Windows arm32
-#     pool:
-#       vmImage: 'vs2017-win2016'
-#     steps:
-#       - powershell: |
-#           $base_version = Get-Content -Path "$(Build.SourcesDirectory)\edgelet\version.txt"
-#           $version = ("{0}{1}" -f $base_version, $(Build.BuildNumber))
-#           Write-Host ("##vso[task.setvariable variable=VERSION;]$version")
-#           Write-Host ("##vso[task.setvariable variable=NO_VALGRIND;]true")
-#         displayName: Set Version
-#       - powershell: edgelet/build/windows/install.ps1 -Arm
-#         displayName: Install Rust
-#       - powershell: edgelet/build/windows/build.ps1 -Release -Arm
-#         displayName: Build
-#       - task: CMake@1
-#         displayName: 'Setup libiothsm'
-#         inputs:
-#           workingDirectory: 'edgelet/hsm-sys/azure-iot-hsm-c/build'
-#           cmakeArgs: '-G "Visual Studio 15 2017 ARM" -DBUILD_SHARED=ON -Duse_emulator=OFF ..'
-#       - task: CMake@1
-#         displayName: 'Build libiothsm'
-#         inputs:
-#           workingDirectory: 'edgelet/hsm-sys/azure-iot-hsm-c/build'
-#           cmakeArgs: '--build . --config Release'
-#       - powershell: edgelet/build/windows/package.ps1 -CreateTemplate -Arm
-#         displayName: Prepare package template
-#       - powershell: edgelet/build/windows/package.ps1 -CreateCab
-#         displayName: Generate CAB package
-#       - task: CopyFiles@2
-#         displayName: 'Copy package to Artifact Staging'
-#         inputs:
-#           SourceFolder: .
-#           Contents: |
-#             *.cab
-#           TargetFolder: '$(build.artifactstagingdirectory)'
-#       - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-#         displayName: 'ESRP Package CodeSigning Internal'
-#         inputs:
-#           ConnectedServiceName: '$(WINDOWS_CODESIGN_SERVICE_CONNECTION)'
-#           FolderPath: '$(build.artifactstagingdirectory)'
-#           Pattern: '*.cab'
-#           CertificateId: 302
-#           OpusName: 'Azure IoT Edge'
-#           OpusInfo: 'https://azure.microsoft.com/en-us/services/iot-edge/'
-#           SessionTimeout: 20
-#       - task: PublishBuildArtifacts@1
-#         displayName: 'Publish Artifact: iotedged-windows'
-#         inputs:
-#           PathtoPublish: '$(build.artifactstagingdirectory)'
-#           ArtifactName: 'iotedged-windows-arm32v7'
+################################################################################
+  - job: windows_arm32
+################################################################################
+    displayName: Windows arm32
+    pool:
+      vmImage: 'vs2017-win2016'
+    steps:
+      - powershell: |
+          $base_version = Get-Content -Path "$(Build.SourcesDirectory)\edgelet\version.txt"
+          $version = ("{0}{1}" -f $base_version, $(Build.BuildNumber))
+          Write-Host ("##vso[task.setvariable variable=VERSION;]$version")
+          Write-Host ("##vso[task.setvariable variable=NO_VALGRIND;]true")
+        displayName: Set Version
+      - powershell: edgelet/build/windows/install.ps1 -Arm
+        displayName: Install Rust
+      - powershell: edgelet/build/windows/build.ps1 -Release -Arm
+        displayName: Build
+      - task: CMake@1
+        displayName: 'Setup libiothsm'
+        inputs:
+          workingDirectory: 'edgelet/hsm-sys/azure-iot-hsm-c/build'
+          cmakeArgs: '-G "Visual Studio 15 2017 ARM" -DBUILD_SHARED=ON -Duse_emulator=OFF ..'
+      - task: CMake@1
+        displayName: 'Build libiothsm'
+        inputs:
+          workingDirectory: 'edgelet/hsm-sys/azure-iot-hsm-c/build'
+          cmakeArgs: '--build . --config Release'
+      - powershell: edgelet/build/windows/package.ps1 -CreateTemplate -Arm
+        displayName: Prepare package template
+      - powershell: edgelet/build/windows/package.ps1 -CreateCab
+        displayName: Generate CAB package
+      - task: CopyFiles@2
+        displayName: 'Copy package to Artifact Staging'
+        inputs:
+          SourceFolder: .
+          Contents: |
+            *.cab
+          TargetFolder: '$(build.artifactstagingdirectory)'
+      - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+        displayName: 'ESRP Package CodeSigning Internal'
+        inputs:
+          ConnectedServiceName: '$(WINDOWS_CODESIGN_SERVICE_CONNECTION)'
+          FolderPath: '$(build.artifactstagingdirectory)'
+          Pattern: '*.cab'
+          CertificateId: 302
+          OpusName: 'Azure IoT Edge'
+          OpusInfo: 'https://azure.microsoft.com/en-us/services/iot-edge/'
+          SessionTimeout: 20
+      - task: PublishBuildArtifacts@1
+        displayName: 'Publish Artifact: iotedged-windows'
+        inputs:
+          PathtoPublish: '$(build.artifactstagingdirectory)'
+          ArtifactName: 'iotedged-windows-arm32v7'
diff --git a/edgelet/build/windows/util.ps1 b/edgelet/build/windows/util.ps1
@@ -143,7 +143,6 @@ function PatchRustForArm {
 
 [patch.crates-io]
 backtrace = { git = "https://github.com/philipktlin/backtrace-rs", branch = "arm" }
-dtoa = { git = "https://github.com/philipktlin/dtoa", branch = "arm" }
 iovec = { git = "https://github.com/philipktlin/iovec", branch = "arm" }
 mio = { git = "https://github.com/philipktlin/mio", branch = "arm" }
 miow = { git = "https://github.com/philipktlin/miow", branch = "arm" }