From 24c901c898f2ae9f48e0ee37da44e5da3af5a2ec Mon Sep 17 00:00:00 2001 From: akallabeth Date: Sat, 10 Feb 2024 12:54:14 +0100 Subject: [PATCH] [ci] fix merge commit extraction for ci --- .github/workflows/clang-tidy.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/fuzzing.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 939312e81..9b127e4ae 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -12,7 +12,7 @@ jobs: id: pr - uses: actions/checkout@v4 with: - ref: ${{fromJSON(steps.pr.outputs.result).merge_commit_sha}} + ref: ${{steps.pr.outputs.merge_commit_sha}} # Run clang-tidy - uses: ZedThree/clang-tidy-review@v0.17.1 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d9e3587ae..3cb0f6f90 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -40,7 +40,7 @@ jobs: id: pr - uses: actions/checkout@v4 with: - ref: ${{fromJSON(steps.pr.outputs.result).merge_commit_sha}} + ref: ${{steps.pr.outputs.merge_commit_sha}} # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/fuzzing.yml b/.github/workflows/fuzzing.yml index 11a4e0234..948fd4224 100644 --- a/.github/workflows/fuzzing.yml +++ b/.github/workflows/fuzzing.yml @@ -22,7 +22,7 @@ jobs: id: pr - uses: actions/checkout@v4 with: - ref: ${{fromJSON(steps.pr.outputs.result).merge_commit_sha}} + ref: ${{steps.pr.outputs.merge_commit_sha}} - name: Build fuzzers (${{ matrix.sanitizer }}) id: build