Commit d0bb7eb7 by Edward Thomson

ci: take an optional shell parameter

Allow the build matrix to specify its shell, in case we provide one in
the setup (eg, Cygwin).
parent a46c4265
...@@ -5,14 +5,19 @@ description: Run a build step in a container or directly on the Actions runner ...@@ -5,14 +5,19 @@ description: Run a build step in a container or directly on the Actions runner
inputs: inputs:
command: command:
description: Command to run description: Command to run
required: true
type: string type: string
required: true
container: container:
description: Optional container to run in description: Optional container to run in
type: string type: string
container-version: container-version:
description: Version of the container to run description: Version of the container to run
type: string type: string
shell:
description: Shell to use
type: string
required: true
default: 'bash'
runs: runs:
using: 'composite' using: 'composite'
...@@ -42,4 +47,4 @@ runs: ...@@ -42,4 +47,4 @@ runs:
else else
${{ inputs.command }} ${{ inputs.command }}
fi fi
shell: bash shell: ${{ inputs.shell != '' && inputs.shell || 'bash' }}
...@@ -241,12 +241,14 @@ jobs: ...@@ -241,12 +241,14 @@ jobs:
command: cd build && ../source/ci/build.sh command: cd build && ../source/ci/build.sh
container: ${{ matrix.platform.container.name }} container: ${{ matrix.platform.container.name }}
container-version: ${{ env.docker-registry-container-sha }} container-version: ${{ env.docker-registry-container-sha }}
shell: ${{ matrix.platform.shell }}
- name: Test - name: Test
uses: ./source/.github/actions/run-build uses: ./source/.github/actions/run-build
with: with:
command: cd build && ../source/ci/test.sh command: cd build && ../source/ci/test.sh
container: ${{ matrix.platform.container.name }} container: ${{ matrix.platform.container.name }}
container-version: ${{ env.docker-registry-container-sha }} container-version: ${{ env.docker-registry-container-sha }}
shell: ${{ matrix.platform.shell }}
- name: Upload test results - name: Upload test results
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
if: success() || failure() if: success() || failure()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment