Skip to content

Commit

Permalink
Introduce extra_build_args to Jobs/PrGate.yml. Move extra_install_ste…
Browse files Browse the repository at this point in the history
…ps to after stuart_update call. (#292)

extra_install_step is moved to after stuart_update.

extra_install_steps can be used to pass a call to another stuart_update
to include the --codeql parameter.
  • Loading branch information
apop5 authored Feb 6, 2024
1 parent 020324d commit 170b872
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
6 changes: 5 additions & 1 deletion Jobs/PrGate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ parameters:
displayName: Perform Stuart PR Evaluation
type: boolean
default: true
- name: extra_build_args
displayName: Extra Build Command Arguments
type: string
default: 'CODE_COVERAGE=TRUE CC_FLATTEN=TRUE CC_FULL=TRUE'
- name: extra_post_build_steps
displayName: Extra Post-Build Steps
type: stepList
Expand Down Expand Up @@ -166,4 +170,4 @@ jobs:
self_host_agent: true
${{ else }}:
self_host_agent: false
extra_build_args: CODE_COVERAGE=TRUE CC_FLATTEN=TRUE CC_FULL=TRUE
extra_build_args: ${{ parameters.extra_build_args }}
12 changes: 6 additions & 6 deletions Steps/PrGate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,6 @@ steps:
- ${{ if eq(parameters.install_tools, true) }}:
- template: InstallCoverageTools.yml

# Potential Extra steps
- ${{ if eq(parameters.self_host_agent, false) }}:
- ${{ parameters.extra_install_step }}
- ${{ else }}:
- bash: echo "##[warning]A self-hosted agent build requested extra install steps. Those are not supported right now."

# Build repo
- ${{ if eq(parameters.do_ci_setup, true) }}:
- task: CmdLine@2
Expand All @@ -150,6 +144,12 @@ steps:
script: stuart_update -c ${{ parameters.build_file }} -p $(pkgs_to_build) -t ${{ parameters.build_targets}} -a ${{ parameters.build_archs}} TOOL_CHAIN_TAG=${{ parameters.tool_chain_tag}}
condition: and(gt(variables.pkg_count, 0), succeeded())

# Potential Extra steps
- ${{ if eq(parameters.self_host_agent, false) }}:
- ${{ parameters.extra_install_step }}
- ${{ else }}:
- bash: echo "##[warning]A self-hosted agent build requested extra install steps. Those are not supported right now."

- ${{ if eq(parameters.do_non_ci_build, true) }}:
- task: CmdLine@2
displayName: Build and Test ${{ parameters.build_pkgs }} ${{ parameters.build_archs}}
Expand Down

0 comments on commit 170b872

Please sign in to comment.