force brew qt on mac m1 build

This commit is contained in:
Alessandro Muntoni 2024-02-01 10:05:10 +01:00
parent f9b44033c6
commit b41f92f4e4
3 changed files with 19 additions and 9 deletions

View File

@ -10,8 +10,12 @@ inputs:
description: 'Cache key'
required: false
default: ''
build-option:
description: 'Build option'
build-precision:
description: 'Build precision'
required: false
default: ''
build-options:
description: 'Build options'
required: false
default: ''
nightly:
@ -27,9 +31,9 @@ runs:
id: envs
shell: bash
run: |
if [ "${{ inputs.build-option }}" != "" ]; then
echo "build_option=--${{ inputs.build-option }}" >> $GITHUB_OUTPUT
echo "artifact_suffix=_${{ inputs.build-option }}" >> $GITHUB_OUTPUT
if [ "${{ inputs.build-precision }}" != "" ]; then
echo "build_option=--${{ inputs.build-precision }}" >> $GITHUB_OUTPUT
echo "artifact_suffix=_${{ inputs.build-precision }}" >> $GITHUB_OUTPUT
else
echo "build_option=" >> $GITHUB_OUTPUT
echo "artifact_suffix=" >> $GITHUB_OUTPUT
@ -49,8 +53,8 @@ runs:
- name: Ccache
uses: hendrikmuhs/ccache-action@v1.2
with:
key: ${{ runner.os }}-${{ github.ref }}-${{ inputs.build-option }}
key: ${{ runner.os }}-${{ github.ref }}-${{ inputs.build-precision }}
- name: Configure and Build
shell: bash
run: |
bash scripts/${{ runner.os }}/1_build.sh ${{ steps.envs.outputs.build_option }} ${{ steps.envs.outputs.nightly }} --use_brew_llvm --ccache
bash scripts/${{ runner.os }}/1_build.sh ${{ steps.envs.outputs.build_option }} ${{ inputs.build-options }} ${{ steps.envs.outputs.nightly }} --use_brew_llvm --ccache

View File

@ -33,12 +33,18 @@ jobs:
else
echo "artifact_suffix=" >> $GITHUB_OUTPUT
fi
if [ "${{matrix.os}}" == "macos-14" ]; then
echo "build_options=--use_brew_qt" >> $GITHUB_OUTPUT
else
echo "build_options=" >> $GITHUB_OUTPUT
fi
- name: Build
uses: ./.github/actions/1_build
with:
cache-path: src/external/downloads/*
cache-key: external-libraries
build-option: ${{matrix.precision}}
build-precision: ${{matrix.precision}}
build-options: ${{steps.envs.outputs.build_options}}
nightly: true
- name: Deploy
uses: ./.github/actions/2_deploy

View File

@ -57,7 +57,7 @@ jobs:
with:
cache-path: src/external/downloads/*
cache-key: external-libraries
build-option: ${{matrix.precision}}
build-precision: ${{matrix.precision}}
- name: Deploy
uses: ./.github/actions/2_deploy
with: