Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No default test app builds. Force build during Github CI #2004

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+10 −6
Open

No default test app builds. Force build during Github CI #2004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ jobs:
then
clang-format --version # A check for version 9 should be added.
git fetch origin ${{ github.base_ref }} # Fetch target branch to FETCH_HEAD for code style check.
python3 scripts/build.py --config ${{ matrix.config.type }} --check-code-style-base FETCH_HEAD --parallel 0
python3 scripts/build.py --config ${{ matrix.config.type }} --check-code-style-base FETCH_HEAD --parallel 0 --test-apps --test-apps
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why twice?

python3 framework/generated/generate_vulkan.py # check generated code isn't out of date
git diff --exit-code
else
python3 scripts/build.py --config ${{ matrix.config.type }} --skip-check-code-style --parallel 0
python3 scripts/build.py --config ${{ matrix.config.type }} --skip-check-code-style --parallel 0 --test-apps --test-apps
fi
- name: Prepare artifacts
run: |
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
git diff --exit-code
- name: Run build script
run: |
python scripts\build.py --skip-check-code-style --config ${{ matrix.config.type }} --parallel 0
python scripts\build.py --skip-check-code-style --config ${{ matrix.config.type }} --parallel 0 --test-apps
- name: Prepare artifacts
run: |
copy LICENSE.txt ${{ matrix.config.build_dir }}\windows\x64\output\bin\
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
run: .github/workflows/scripts/build-dependencies-macos.sh
- name: Run build script
run: |
python3 scripts/build.py --skip-check-code-style --config ${{ matrix.config.type }} --cmake-extra "CMAKE_PREFIX_PATH=$HOME/deps" --cmake-extra CMAKE_OSX_DEPLOYMENT_TARGET=11.0 --parallel 0
python3 scripts/build.py --skip-check-code-style --config ${{ matrix.config.type }} --cmake-extra "CMAKE_PREFIX_PATH=$HOME/deps" --cmake-extra CMAKE_OSX_DEPLOYMENT_TARGET=11.0 --parallel 0 --test-apps
- name: Prepare artifacts
run: |
cp LICENSE.txt ${{ matrix.config.build_dir }}/darwin/universal/output/bin/
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ endif()

option(GFXRECON_TOCPP_SUPPORT "Build ToCpp export tool as part of GFXReconstruct builds." TRUE)

option(GFXRECON_INCLUDE_TEST_APPS "Build and install test apps" ON)
option(GFXRECON_INCLUDE_TEST_APPS "Build and install test apps" OFF)

if(MSVC)

Expand Down
6 changes: 5 additions & 1 deletion scripts/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ def parse_args():
'--check-code-style-base', dest='check_code_style_base',
metavar='BASE', action='store', default='HEAD',
help='Git branch name or commit ID to use as the base for C++ code style comparison')
arg_parser.add_argument(
'--test-apps', dest='test_apps',
action='store_true', default=False,
help='Build test apps')
arg_parser.add_argument(
'--cmake-system-version', dest='cmake_system_version',
type=str, default="10.0.20348.0",help='Select SDK version')
Expand Down Expand Up @@ -218,7 +222,7 @@ def cmake_generate_options(args):
generate_options.append(
'-DRUN_TESTS={}'.format('OFF' if args.skip_tests else 'ON'))
generate_options.append(
'-DGFXRECON_INCLUDE_TEST_APPS={}'.format('OFF' if args.skip_tests else 'ON'))
'-DGFXRECON_INCLUDE_TEST_APPS={}'.format('ON' if args.test_apps else 'OFF'))
generate_options.append(
'-DGENERATE_TEST_ARCHIVE={}'.format(
'ON' if args.test_archive else 'OFF'))
Expand Down