Skip to content

Commit

Permalink
.github: replace HAVE_CONFIG KConfig hack with an override
Browse files Browse the repository at this point in the history
Should make git describe --dirty clean.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
  • Loading branch information
marc-hb authored and lgirdwood committed Mar 23, 2021
1 parent 0a9262a commit 7e19c42
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,20 +117,18 @@ jobs:
- uses: actions/checkout@v2
with: {fetch-depth: 0, submodules: recursive}

# FIXME: could/should probably use ./scripts/xtensa-build-all.sh
# -o agent.config instead of hiding this here.
- name: turn off HAVE_AGENT
run: sed -i $(($(grep "config HAVE_AGENT" -n src/platform/Kconfig |
cut -f1 -d:)+2))"s/default y/default n/" src/platform/Kconfig
run: echo CONFIG_HAVE_AGENT=n >
src/arch/xtensa/configs/override/no-agent.config

- name: docker SOF
run: docker pull thesofproject/sof && docker tag thesofproject/sof sof

- name: xtensa-build-all
- name: xtensa-build-all -o no-agent
env:
PLATFORM: ${{ matrix.platform }}
run: ./scripts/docker-run.sh
./scripts/xtensa-build-all.sh -r ${PLATFORM}
./scripts/xtensa-build-all.sh -o no-agent -r ${PLATFORM}

- name: docker QEMU
run: docker pull thesofproject/sofqemu &&
Expand Down
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,8 @@ jobs:
- &qemuboottest
stage: tests
script:
- sed -i $(($(grep "config HAVE_AGENT" -n src/platform/Kconfig |
cut -f1 -d:)+2))"s/default y/default n/" src/platform/Kconfig
- ./scripts/docker-run.sh ./scripts/xtensa-build-all.sh -r $PLATFORM
- echo CONFIG_HAVE_AGENT=n > src/arch/xtensa/configs/override/no-agent.config
- ./scripts/docker-run.sh ./scripts/xtensa-build-all.sh -o no-agent -r $PLATFORM
- ./scripts/docker-qemu.sh ../sof.git/scripts/qemu-check.sh $PLATFORM
env: PLATFORM='byt cht'
before_install:
Expand Down

0 comments on commit 7e19c42

Please sign in to comment.