From f553c1487dc2df78cb75a3c66a1f96321d2a7d91 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Thu, 8 Jul 2021 11:53:54 +0300 Subject: map version 4 to 4.0 --- .github/actions/build-foo/action.yml | 7 ++++--- .github/workflows/test.yml | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/actions/build-foo/action.yml b/.github/actions/build-foo/action.yml index c86fecb..36fc650 100644 --- a/.github/actions/build-foo/action.yml +++ b/.github/actions/build-foo/action.yml @@ -1,9 +1,10 @@ name: Build foo.exe description: Build foo.exe inputs: - version: - description: Version to use + binary: + description: Compiler binary file name required: false + default: clang++ platform: description: Target platform required: true @@ -23,5 +24,5 @@ runs: $flags += '-lpthread' } - & "clang++$version" $flags + & '${{ inputs.binary }}' $flags shell: pwsh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bef51b3..feda01d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Set up Clang + - id: setup + name: Set up Clang uses: ./ with: version: '${{ matrix.version }}' @@ -59,7 +60,7 @@ jobs: - name: Build foo.exe uses: ./.github/actions/build-foo with: - version: '${{ matrix.version }}' + binary: '${{ steps.setup.outputs.clangxx }}' - name: Run foo.exe uses: ./.github/actions/run-foo - name: Check cc/c++ -- cgit v1.2.3