diff options
Diffstat (limited to '.github/actions')
| -rw-r--r-- | .github/actions/build-threads/action.yml | 12 | ||||
| -rw-r--r-- | .github/actions/check-cc/action.yml | 6 | ||||
| -rw-r--r-- | .github/actions/check-lld/action.yml | 6 |
3 files changed, 14 insertions, 10 deletions
diff --git a/.github/actions/build-threads/action.yml b/.github/actions/build-threads/action.yml index 8c754b0..86515f7 100644 --- a/.github/actions/build-threads/action.yml +++ b/.github/actions/build-threads/action.yml @@ -11,12 +11,12 @@ inputs: runs: using: composite steps: - - run: | - $version = '${{ inputs.version }}' - $version = if ($version) { "-$version" } else { $version } - + - env: + ARG_BINARY: ${{ inputs.binary }} + ARG_PLATFORM: ${{ inputs.platform }} + run: | $flags = @() - if ('${{ matrix.platform }}' -eq 'x86') { + if ($env:ARG_PLATFORM -eq 'x86') { $flags += '-m32' } $flags += '-std=c++14','-o','test/threads.exe','test/threads.cpp' @@ -24,5 +24,5 @@ runs: $flags += '-lpthread' } - & '${{ inputs.binary }}' $flags + & $env:ARG_BINARY $flags shell: pwsh diff --git a/.github/actions/check-cc/action.yml b/.github/actions/check-cc/action.yml index 4dbeb0a..646babc 100644 --- a/.github/actions/check-cc/action.yml +++ b/.github/actions/check-cc/action.yml @@ -7,7 +7,9 @@ inputs: runs: using: composite steps: - - run: | + - env: + ARG_VERSION: ${{ inputs.version }} + run: | function Check-Exe { param( [Parameter(Mandatory=$true)] @@ -20,7 +22,7 @@ runs: $($output | Select-String -Pattern "clang version" -SimpleMatch -Quiet) -or $(throw "Unexpected `$Exe --version` output") - $version = '${{ inputs.version }}' + $version = $env:ARG_VERSION if ($version) { $($output | Select-String -Pattern "$version." -SimpleMatch -Quiet) -or $(throw "Unexpected `$Exe --version` output") } diff --git a/.github/actions/check-lld/action.yml b/.github/actions/check-lld/action.yml index 5bb25b6..1eea794 100644 --- a/.github/actions/check-lld/action.yml +++ b/.github/actions/check-lld/action.yml @@ -7,7 +7,9 @@ inputs: runs: using: composite steps: - - run: | + - env: + ARG_VERSION: ${{ inputs.version }} + run: | function Check-Exe { param( [Parameter(Mandatory=$true)] @@ -23,7 +25,7 @@ runs: $($output | Select-String -Pattern $HelpString -SimpleMatch -Quiet) -or $(throw "Unexpected `$Exe --version` output") } - $version = '${{ inputs.version }}' + $version = $env:ARG_VERSION $driver_exe = 'lld' # Although the output of `lld --version` claims that it's ld-link on |