Steps/RustCargoSteps.yml: Parameterize commands (#252)

Allows the format, test, and build commands to be customized by a caller. The default values remain the same as the previous commands for backward compatibility. Repos that only contain pure Rust code may choose to pass conventional cargo commands or custom wrapper commands. Signed-off-by: Michael Kubacki <[email protected]>
microsoft · Sep 22, 2023 · e2f5540 · e2f5540
1 parent d7d1b8a
commit e2f5540
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/.sync/azure_pipelines/MuDevOpsWrapper.yml b/.sync/azure_pipelines/MuDevOpsWrapper.yml
@@ -116,6 +116,8 @@ jobs:
       clean: true
     - ${{ parameters.extra_cargo_steps }}
     - template: Steps/RustCargoSteps.yml@mu_devops
+      parameters:
+        container_build: ${{ parameters.container_build }}
 
 - ${{ parameters.extra_jobs }}
 {% endraw %}
diff --git a/Steps/RustCargoSteps.yml b/Steps/RustCargoSteps.yml
@@ -7,6 +7,24 @@
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
 
+parameters:
+- name: format_command
+  displayName: Rust Format Command
+  type: string
+  default: "cargo fmt --all --check"
+- name: test_command
+  displayName: Rust Test Command
+  type: string
+  default: "cargo make test"
+- name: build_command
+  displayName: Rust Build Command
+  type: string
+  default: "cargo make build"
+- name: container_build
+  displayName: Flag for whether this repo should do stuart_setup
+  type: boolean
+  default: false
+
 steps:
 
 - task: CmdLine@2
@@ -18,28 +36,28 @@ steps:
       /usr/bin/docker exec mu_devops_build_container chmod -R ug+rw /.cargo
       /usr/bin/docker exec mu_devops_build_container chown -R vsts_azpcontainer:docker_azpcontainer /.rustup
       /usr/bin/docker exec mu_devops_build_container chmod -R ug+rw /.rustup
-  condition: eq(variables['Agent.OS'], 'Linux')
+  condition: and(eq('${{ parameters.container_build }}', 'true'), eq(variables['Agent.OS'], 'Linux'))
 
 - task: CmdLine@2
   displayName: cargo fmt
   inputs:
-    script: 'cargo fmt --all --check'
+    script: ${{ parameters.format_command }}
     workingDirectory: '$(System.DefaultWorkingDirectory)'
     failOnStandardError: true
   condition: succeeded()
 
 - task: CmdLine@2
   displayName: cargo make test
   inputs:
-    script: 'cargo make test'
+    script: ${{ parameters.test_command }}
     workingDirectory: '$(System.DefaultWorkingDirectory)'
     failOnStandardError: true
   condition: succeeded()
 
 - task: CmdLine@2
   displayName: cargo make build
   inputs:
-    script: 'cargo make build'
+    script: ${{ parameters.build_command }}
     workingDirectory: '$(System.DefaultWorkingDirectory)'
     failOnStandardError: true
   condition: succeeded()