Skip to content

Commit

Permalink
Remove clang_experimental build for real this time (#8462)
Browse files Browse the repository at this point in the history
This build was intended to be removed in 9488c1a ("Remove linux
clang_experimental build (#7467)") but was left in the matrix and has
since been wasting capacity.

To prevent waste going forward, make unrecognized build types in the
matrix fail when deriving the arguments. Also, simplify the arguments
setting a bit - for brevity options that are defaults are not specified;
the original builds worked this way but the new logging build did not.
  • Loading branch information
mspang authored and pull[bot] committed Sep 1, 2021
1 parent 806d7b9 commit 4374321
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ jobs:

strategy:
matrix:
type: [gcc_debug, gcc_release, clang, mbedtls, clang_experimental, no_detail_logging, no_progress_logging]
type: [gcc_debug, gcc_release, clang, mbedtls, no_detail_logging, no_progress_logging]
env:
BUILD_TYPE: ${{ matrix.type }}
DETAIL_LOGGING: ${{ matrix.type != 'no_detail_logging' && matrix.type != 'no_progress_logging' }}
PROGRESS_LOGGING: ${{ matrix.type != 'no_progress_logging' }}

runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'
Expand Down Expand Up @@ -84,10 +82,12 @@ jobs:
"gcc_release") GN_ARGS='is_debug=false';;
"clang") GN_ARGS='is_clang=true';;
"mbedtls") GN_ARGS='chip_crypto="mbedtls"';;
*) ;;
"no_detail_logging") GN_ARGS='chip_progress_logging=false';;
"no_progress_logging") GN_ARGS='chip_progress_logging=false chip_detail_logging=false';;
*) echo >&2 "Unrecognized build type: ${BUILD_TYPE}"; exit 1;;
esac
scripts/build/gn_gen.sh --args="$GN_ARGS chip_detail_logging=${DETAIL_LOGGING} chip_progress_logging=${PROGRESS_LOGGING}"
scripts/build/gn_gen.sh --args="$GN_ARGS"
- name: Run Build
timeout-minutes: 10
run: scripts/build/gn_build.sh
Expand Down

0 comments on commit 4374321

Please sign in to comment.