diff options
| author | kobalicek <kobalicek.petr@gmail.com> | 2020-11-07 21:25:47 +0300 |
|---|---|---|
| committer | kobalicek <kobalicek.petr@gmail.com> | 2020-11-07 21:31:03 +0300 |
| commit | 2199c7d4e7b6a67ddac6d864e12d47b4f32e3679 (patch) | |
| tree | e6d02ff2304e9fcefd44b9a2fd1c90bc76bee269 | |
| parent | fe89388e52ff262d684c96bd2812eeab24aa96e3 (diff) | |
Improved CI problem matching by always doing out-of-source build (Ninja issue)
| -rw-r--r-- | .github/workflows/build.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/run-step.py | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 860b207..4f6db04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,6 +97,8 @@ jobs: steps: - name: "Checkout" uses: actions/checkout@v2 + with: + path: "source" - name: "Python" uses: actions/setup-python@v2 @@ -104,14 +106,14 @@ jobs: python-version: "3.x" - name: "Prepare" - run: python -B .github/workflows/run-step.py + run: python -B source/.github/workflows/run-step.py --step=prepare --compiler=${{matrix.cxx}} --architecture=${{matrix.architecture}} --diagnose=${{matrix.diagnose}} - name: "Configure" - run: python -B .github/workflows/run-step.py + run: python -B source/.github/workflows/run-step.py --step=configure --compiler=${{matrix.cxx}} --architecture=${{matrix.architecture}} @@ -121,7 +123,7 @@ jobs: --problem-matcher=${{matrix.problem_matcher}} - name: "Build" - run: python -B .github/workflows/run-step.py + run: python -B source/.github/workflows/run-step.py --step=build --compiler=${{matrix.cxx}} --architecture=${{matrix.architecture}} @@ -129,7 +131,7 @@ jobs: --diagnose=${{matrix.diagnose}} - name: "Test" - run: python -B .github/workflows/run-step.py + run: python -B source/.github/workflows/run-step.py --step=test --build-type=${{matrix.build_type}} --diagnose=${{matrix.diagnose}} diff --git a/.github/workflows/run-step.py b/.github/workflows/run-step.py index adb24b6..9f209df 100644 --- a/.github/workflows/run-step.py +++ b/.github/workflows/run-step.py @@ -76,8 +76,10 @@ def main(): generator = "Visual Studio 15 2017" elif compiler == "vs2019": generator = "Visual Studio 16 2019" - else: + elif platform_name == "Darwin": generator = "Unix Makefiles" + else: + generator = "Ninja" # --------------------------------------------------------------------------- @@ -126,7 +128,7 @@ def main(): # --------------------------------------------------------------------------- if step == "configure": 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) |