diff --git a/.github/workflows/check-commits.yml b/.github/workflows/check-commits.yml index c4d15bacf70a6..fb33c3af742f3 100644 --- a/.github/workflows/check-commits.yml +++ b/.github/workflows/check-commits.yml @@ -27,9 +27,9 @@ jobs: run: | ./dist/tools/${{ matrix.check }}/check.sh "${{ github.base_ref }}" check-commits-success: - needs: check-commits - if: github.event_name != 'merge_group' + # needs: check-commits runs-on: ubuntu-latest steps: - name: check-commits succeeded - run: exit 0 + if: github.event_name == 'merge_group' + run: exit 1 diff --git a/.github/workflows/reftest.yml b/.github/workflows/reftest.yml new file mode 100644 index 0000000000000..c80516db49aa0 --- /dev/null +++ b/.github/workflows/reftest.yml @@ -0,0 +1,22 @@ +name: ref-print +on: + pull_request: + merge_group: + +jobs: + ref-print: + runs-on: ubuntu-latest + steps: + - name: set CI_BASE_BRANCH + run: | + if [ -n "${{ github.base_ref }}" ]; then + echo "CI_BASE_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV + elif [ -n "${{ github.event.merge_group.base_ref }}" ]; then + echo "CI_BASE_BRANCH=${{ github.event.merge_group.base_ref }}" | sed s.=refs/heads/.=. >> $GITHUB_ENV + fi + + - name: echo CI_BASE_BRANCH + run: echo CI_BASE_BRANCH=$CI_BASE_BRANCH + - name: fail-if + if: github.event_name == 'merge_group' + run: "false"