Improved CI problem matching by always doing out-of-source build (Ninja issue)

This commit is contained in:
kobalicek
2020-11-07 19:25:47 +01:00
parent fe89388e52
commit 2199c7d4e7
2 changed files with 10 additions and 6 deletions

View File

@@ -97,6 +97,8 @@ jobs:
steps: steps:
- name: "Checkout" - name: "Checkout"
uses: actions/checkout@v2 uses: actions/checkout@v2
with:
path: "source"
- name: "Python" - name: "Python"
uses: actions/setup-python@v2 uses: actions/setup-python@v2
@@ -104,14 +106,14 @@ jobs:
python-version: "3.x" python-version: "3.x"
- name: "Prepare" - name: "Prepare"
run: python -B .github/workflows/run-step.py run: python -B source/.github/workflows/run-step.py
--step=prepare --step=prepare
--compiler=${{matrix.cxx}} --compiler=${{matrix.cxx}}
--architecture=${{matrix.architecture}} --architecture=${{matrix.architecture}}
--diagnose=${{matrix.diagnose}} --diagnose=${{matrix.diagnose}}
- name: "Configure" - name: "Configure"
run: python -B .github/workflows/run-step.py run: python -B source/.github/workflows/run-step.py
--step=configure --step=configure
--compiler=${{matrix.cxx}} --compiler=${{matrix.cxx}}
--architecture=${{matrix.architecture}} --architecture=${{matrix.architecture}}
@@ -121,7 +123,7 @@ jobs:
--problem-matcher=${{matrix.problem_matcher}} --problem-matcher=${{matrix.problem_matcher}}
- name: "Build" - name: "Build"
run: python -B .github/workflows/run-step.py run: python -B source/.github/workflows/run-step.py
--step=build --step=build
--compiler=${{matrix.cxx}} --compiler=${{matrix.cxx}}
--architecture=${{matrix.architecture}} --architecture=${{matrix.architecture}}
@@ -129,7 +131,7 @@ jobs:
--diagnose=${{matrix.diagnose}} --diagnose=${{matrix.diagnose}}
- name: "Test" - name: "Test"
run: python -B .github/workflows/run-step.py run: python -B source/.github/workflows/run-step.py
--step=test --step=test
--build-type=${{matrix.build_type}} --build-type=${{matrix.build_type}}
--diagnose=${{matrix.diagnose}} --diagnose=${{matrix.diagnose}}

View File

@@ -76,8 +76,10 @@ def main():
generator = "Visual Studio 15 2017" generator = "Visual Studio 15 2017"
elif compiler == "vs2019": elif compiler == "vs2019":
generator = "Visual Studio 16 2019" generator = "Visual Studio 16 2019"
else: elif platform_name == "Darwin":
generator = "Unix Makefiles" generator = "Unix Makefiles"
else:
generator = "Ninja"
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@@ -126,7 +128,7 @@ def main():
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
if step == "configure": if step == "configure":
if args.problem_matcher: if args.problem_matcher:
log("::add-matcher::.github/problem-matcher.json") log("::add-matcher::" + os.path.join(source_root, ".github", "problem-matcher.json"))
os.makedirs(args.build_dir, exist_ok=True) os.makedirs(args.build_dir, exist_ok=True)