Revert "TEMP: Drop CryptoPkg from pipelines builds (until Shared Cryp…

…to is added)" This reverts commit now that CryptoPkg is buildable and in its final state for 2405. Signed-off-by: Michael Kubacki <[email protected]>
microsoft · Jun 25, 2024 · 328c78c · 328c78c
1 parent 6f9f284
commit 328c78c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 26 deletions.
diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-GCC5.yml
@@ -54,12 +54,10 @@ extends:
         Pkgs: 'UnitTestFrameworkPkg'
         Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
         ArchList: $(arch_list)
-      # TEMP_CHANGE [BEGIN]: Disable CryptoPkg build until Shared Crypto changes are in place
-      # TARGET_CRYPTO:
-      #   Pkgs: 'CryptoPkg'
-      #   Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
-      #   ArchList: $(arch_list)
-      # TEMP_CHANGE [END]: Disable CryptoPkg build until Shared Crypto changes are in place
+      TARGET_CRYPTO:
+        Pkgs: 'CryptoPkg'
+        Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
+        ArchList: $(arch_list)
       TARGET_MDE_CPU_ARM:
         Pkgs: 'MdePkg,UefiCpuPkg'
         Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
@@ -90,10 +88,8 @@ extends:
         Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
         ArchList: $(arch_list)
         SelfHostAgent: true
-      # TEMP_CHANGE [BEGIN]: Disable CryptoPkg build until Shared Crypto changes are in place
-      # TARGET_CRYPTO_ARM:
-      #   Pkgs: 'CryptoPkg'
-      #   Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
-      #   ArchList: $(arch_list)
-      #   SelfHostAgent: true
-      # TEMP_CHANGE [END]: Disable CryptoPkg build until Shared Crypto changes are in place
+      TARGET_CRYPTO_ARM:
+        Pkgs: 'CryptoPkg'
+        Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
+        ArchList: $(arch_list)
+        SelfHostAgent: true
diff --git a/.azurepipelines/Windows-VS.yml b/.azurepipelines/Windows-VS.yml
@@ -49,12 +49,10 @@ extends:
         Pkgs: 'PcAtChipsetPkg,ShellPkg,StandaloneMmPkg,BaseTools'
         Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
         ArchList: $(arch_list)
-      # TEMP_CHANGE [BEGIN]: Disable CryptoPkg build until Shared Crypto changes are in place
-      # TARGET_CRYPTO:
-      #   Pkgs: 'CryptoPkg'
-      #   Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
-      #   ArchList: $(arch_list)
-      # TEMP_CHANGE [END]: Disable CryptoPkg build until Shared Crypto changes are in place
+      TARGET_CRYPTO:
+        Pkgs: 'CryptoPkg'
+        Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
+        ArchList: $(arch_list)
       TARGET_MDE_CPU_ARM:
         Pkgs: 'MdePkg,UefiCpuPkg'
         Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
@@ -85,10 +83,8 @@ extends:
         Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
         ArchList: $(arch_list)
         SelfHostAgent: true
-      # TEMP_CHANGE [BEGIN]: Disable CryptoPkg build until Shared Crypto changes are in place
-      # TARGET_CRYPTO_ARM:
-      #   Pkgs: 'CryptoPkg'
-      #   Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
-      #   ArchList: $(arch_list)
-      #   SelfHostAgent: true
-      # TEMP_CHANGE [END]: Disable CryptoPkg build until Shared Crypto changes are in place
+      TARGET_CRYPTO_ARM:
+        Pkgs: 'CryptoPkg'
+        Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
+        ArchList: $(arch_list)
+        SelfHostAgent: true