diff --git a/.github/actions/cpp-tests/action.yaml b/.github/actions/cpp-tests/action.yaml index 1d7d0068..73492e84 100644 --- a/.github/actions/cpp-tests/action.yaml +++ b/.github/actions/cpp-tests/action.yaml @@ -4,9 +4,9 @@ inputs: build_type: required: true description: Is the build a debug or release version - compiler: + conan_profile: required: true - description: Which compiler to use + description: Which conan profile to use shell: required: true description: Which shell to use for the `run` command @@ -24,7 +24,7 @@ runs: conan profile detect --force build_type=${{ inputs.build_type }} lowercase_build_type=$(echo ${build_type} | tr '[:upper:]' '[:lower:]') - conan build . -pr=conan/profiles/tests-${lowercase_build_type} -s:b compiler=${{ inputs.compiler }} -b missing + conan build . -pr=conan/profiles/${{ inputs.conan_profile }} -b missing shell: ${{ inputs.shell }} - name: Test working-directory: build/${{ inputs.build_type }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 499159d8..9ebadf0c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: - uses: ./.github/actions/cpp-tests with: build_type: ${{ matrix.build_type }} - compiler: ${{ matrix.compiler }} + conan_profile: tests-${{ matrix.build_type }}-${{ matrix.compiler }}-linux-x64 shell: bash cpp-macos-x64: @@ -43,7 +43,7 @@ jobs: - uses: ./.github/actions/cpp-tests with: build_type: ${{ matrix.build_type }} - compiler: clang + conan_profile: tests-${{ matrix.build_type }}-macos-x64 shell: bash cpp-windows-x64: @@ -61,7 +61,7 @@ jobs: - uses: ./.github/actions/cpp-tests with: build_type: ${{ matrix.build_type }} - compiler: msvc + conan_profile: tests-${{ matrix.build_type }}-windows-x64 shell: bash cpp-linux-arm64: @@ -89,8 +89,8 @@ jobs: apt-get install -y bison flex default-jre - uses: ./.github/actions/cpp-tests with: - build_type: Release - compiler: gcc + build_type: ${{ matrix.build_type }} + conan_profile: tests-${{ matrix.build_type }}-linux-arm64 shell: bash cpp-macos-arm64: @@ -117,8 +117,8 @@ jobs: shell: bash - uses: ./.github/actions/cpp-tests with: - build_type: Release - compiler: clang + build_type: ${{ matrix.build_type }} + conan_profile: tests-${{ matrix.build_type }}-macos-arm64 shell: bash python-linux-x64: diff --git a/conan/profiles/release b/conan/profiles/release index c4133034..7842c688 100644 --- a/conan/profiles/release +++ b/conan/profiles/release @@ -8,6 +8,3 @@ libqasm/*:build_type=Release libqasm/*:asan_enabled=False libqasm/*:build_tests=False libqasm/*:compat=False - -[conf] -tools.build:cxxflags=["-Wno-error=maybe-uninitialized"] diff --git a/conan/profiles/tests-release b/conan/profiles/tests-release index fe28a566..e0ab99ec 100644 --- a/conan/profiles/tests-release +++ b/conan/profiles/tests-release @@ -8,6 +8,3 @@ libqasm/*:build_type=Release libqasm/*:asan_enabled=True libqasm/*:build_tests=True libqasm/*:compat=False - -[conf] -tools.build:cxxflags=["-Wno-error=maybe-uninitialized"]