diff --git a/.github/actions/do_build_ock/action.yml b/.github/actions/do_build_ock/action.yml index dc3e2cd99..3cfa90897 100644 --- a/.github/actions/do_build_ock/action.yml +++ b/.github/actions/do_build_ock/action.yml @@ -104,15 +104,13 @@ inputs: description: "which shell to use (default bash)" default: bash -env: - EXTERNAL_CLC: unset - runs: # we don't want a new docker just a list of steps, so mark as composite using: "composite" steps: - name: set ICD registry + id: set_windows if: startsWith(runner.os, 'Windows') shell: ${{ inputs.shell_to_use }} run: | @@ -122,9 +120,16 @@ runs: $PATTERN = '[\\]' $GITHUB_WORKSPACELINUX = $GITHUB_WORKSPACELINUX -replace $PATTERN, '/' echo GITHUB_WORKSPACELINUX is $GITHUB_WORKSPACELINUX - echo EXTERNAL_CLC is $env.EXTERNAL_CLC - $env.EXTERNAL_CLC = $GITHUB_WORKSPACELINUX - echo EXTERNAL_CLC is $env.EXTERNAL_CLC + echo "windwsclc=$GITHUB_WORKSPACELINUX" >> $GITHUB_OUTPUT + + - name: set external_clc ubuntu + id: set_ubuntu + if: startsWith(runner.os, 'Ubuntu') + shell: ${{ inputs.shell_to_use }} + run: | + GITHUB_WORKSPACELINUX = ${{ inputs.external_clc }} + echo GITHUB_WORKSPACELINUX is $GITHUB_WORKSPACELINUX + echo "ubuntuclc=$GITHUB_WORKSPACELINUX" >> $GITHUB_OUTPUT - name: cmake_ock shell: ${{ inputs.shell_to_use }}